[Scummvm-git-logs] scummvm master -> ac5bd7c76fee240ab7ae66b4753e2c67bd511f5b

[digitall]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
696de01630 BACKENDS: NETWORKING: Fix for GCC Warnings from 64-bit Stream API Changes
b5c3a179c7 CLOUD: Fix for GCC Warnings from 64-bit Stream API Changes
ac5bd7c76f SAGA2: Fix GCC Signed vs. Unsigned Comparison Warnings


Commit: 696de01630139c5fa64d5795d372bbb5e587ae40
    https://github.com/scummvm/scummvm/commit/696de01630139c5fa64d5795d372bbb5e587ae40
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:35:47+01:00

Commit Message:
BACKENDS: NETWORKING: Fix for GCC Warnings from 64-bit Stream API Changes

Changed paths:
    backends/networking/sdl_net/getclienthandler.cpp


diff --git a/backends/networking/sdl_net/getclienthandler.cpp b/backends/networking/sdl_net/getclienthandler.cpp
index 8e940a1a9c..9de826ec0d 100644
--- a/backends/networking/sdl_net/getclienthandler.cpp
+++ b/backends/networking/sdl_net/getclienthandler.cpp
@@ -110,7 +110,7 @@ void GetClientHandler::prepareHeaders() {
 		setHeader("Content-Type", "text/html; charset=UTF-8");
 
 	if (!_specialHeaders.contains("Content-Length") && _stream)
-		setHeader("Content-Length", Common::String::format("%u", _stream->size()));
+		setHeader("Content-Length", Common::String::format("%lu", _stream->size()));
 
 	_headers = Common::String::format("HTTP/1.1 %ld %s\r\n", _responseCode, responseMessage(_responseCode));
 	for (Common::HashMap<Common::String, Common::String>::iterator i = _specialHeaders.begin(); i != _specialHeaders.end(); ++i)


Commit: b5c3a179c7e187873b8b5c8e6f89e95f14ba46a9
    https://github.com/scummvm/scummvm/commit/b5c3a179c7e187873b8b5c8e6f89e95f14ba46a9
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:36:14+01:00

Commit Message:
CLOUD: Fix for GCC Warnings from 64-bit Stream API Changes

Changed paths:
    backends/cloud/googledrive/googledriveuploadrequest.cpp
    backends/cloud/onedrive/onedriveuploadrequest.cpp


diff --git a/backends/cloud/googledrive/googledriveuploadrequest.cpp b/backends/cloud/googledrive/googledriveuploadrequest.cpp
index 1e9ab0fd0f..617a99fce0 100644
--- a/backends/cloud/googledrive/googledriveuploadrequest.cpp
+++ b/backends/cloud/googledrive/googledriveuploadrequest.cpp
@@ -215,7 +215,7 @@ void GoogleDriveUploadRequest::uploadNextPart() {
 		if (_contentsStream->pos() == 0)
 			request->addHeader(Common::String::format("Content-Length: 0"));
 		else
-			request->addHeader(Common::String::format("Content-Range: bytes %u-%u/%u", oldPos, _contentsStream->pos() - 1, _contentsStream->size()));
+			request->addHeader(Common::String::format("Content-Range: bytes %u-%lu/%lu", oldPos, _contentsStream->pos() - 1, _contentsStream->size()));
 	}
 
 	_workingRequest = ConnMan.addRequest(request);
diff --git a/backends/cloud/onedrive/onedriveuploadrequest.cpp b/backends/cloud/onedrive/onedriveuploadrequest.cpp
index 5e7011a6e9..e8339acf7a 100644
--- a/backends/cloud/onedrive/onedriveuploadrequest.cpp
+++ b/backends/cloud/onedrive/onedriveuploadrequest.cpp
@@ -103,7 +103,7 @@ void OneDriveUploadRequest::uploadNextPart() {
 	request->setBuffer(buffer, size);
 
 	if (_uploadUrl != "") {
-		request->addHeader(Common::String::format("Content-Range: bytes %u-%u/%u", oldPos, _contentsStream->pos() - 1, _contentsStream->size()));
+		request->addHeader(Common::String::format("Content-Range: bytes %u-%lu/%lu", oldPos, _contentsStream->pos() - 1, _contentsStream->size()));
 	} else if (_contentsStream->size() == 0) {
 		warning("\"Sorry, OneDrive can't upload empty files\"");
 		finishUpload(StorageFile(_savePath, 0, 0, false));


Commit: ac5bd7c76fee240ab7ae66b4753e2c67bd511f5b
    https://github.com/scummvm/scummvm/commit/ac5bd7c76fee240ab7ae66b4753e2c67bd511f5b
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-09T04:36:30+01:00

Commit Message:
SAGA2: Fix GCC Signed vs. Unsigned Comparison Warnings

Changed paths:
    engines/saga2/actor.cpp
    engines/saga2/player.cpp


diff --git a/engines/saga2/actor.cpp b/engines/saga2/actor.cpp
index 4557362f96..de7d52cfc9 100644
--- a/engines/saga2/actor.cpp
+++ b/engines/saga2/actor.cpp
@@ -436,7 +436,7 @@ bool ActorProto::acceptDamageAction(
 		Location        al = Location(a->getLocation(), a->IDParent());
 		if (gruntStyle > 0
 		        && ((flags & ResourceObjectPrototype::objPropNoSurface)
-		            || (damage > 2 && g_vm->_rnd->getRandomNumber(vitality - 1) < (damage * 2))))
+		            || (damage > 2 && (int16)g_vm->_rnd->getRandomNumber(vitality - 1) < (damage * 2))))
 			makeGruntSound(gruntStyle, al);
 
 		if (enactorPtr != NULL) {
@@ -606,7 +606,7 @@ bool ActorProto::acceptStrikeAction(
 			if (!a->isDead()) {
 				int16 pmass = a->proto()->mass;
 
-				if (pmass <= 100 || g_vm->_rnd->getRandomNumber(154) >= pmass - 100) {
+				if (pmass <= 100 || (int16)g_vm->_rnd->getRandomNumber(154) >= pmass - 100) {
 					if (g_vm->_rnd->getRandomNumber(7) == 0)
 						MotionTask::fallDown(*a, *enactorPtr);
 					else
diff --git a/engines/saga2/player.cpp b/engines/saga2/player.cpp
index 278055dc3f..1b40514e34 100644
--- a/engines/saga2/player.cpp
+++ b/engines/saga2/player.cpp
@@ -354,7 +354,7 @@ void PlayerActor::skillAdvance(uint8 stat,
 
 void PlayerActor::vitalityAdvance(uint8 points) {
 	while (points-- > 0) {
-		if (g_vm->_rnd->getRandomNumber(ActorAttributes::vitalityLimit - 1) > baseStats.vitality) {
+		if ((int16)g_vm->_rnd->getRandomNumber(ActorAttributes::vitalityLimit - 1) > baseStats.vitality) {
 			if (++vitalityMemory >= vitalityLevelBump) {
 				vitalityMemory -= vitalityLevelBump;
 				baseStats.vitality++;