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

digitall 547637+digitall at users.noreply.github.com
Sat May 9 18:38:04 UTC 2020


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

Summary:
ec153bbb68 DRAGONS: Fix Signed Overflow GCC Compiler Warnings


Commit: ec153bbb681b3eca8a3c82398d35ad150524dae6
    https://github.com/scummvm/scummvm/commit/ec153bbb681b3eca8a3c82398d35ad150524dae6
Author: D G Turner (digitall at scummvm.org)
Date: 2020-05-09T19:35:23+01:00

Commit Message:
DRAGONS: Fix Signed Overflow GCC Compiler Warnings

Changed paths:
    engines/dragons/minigame3.cpp
    engines/dragons/specialopcodes.cpp


diff --git a/engines/dragons/minigame3.cpp b/engines/dragons/minigame3.cpp
index df7b476f70..9442958582 100644
--- a/engines/dragons/minigame3.cpp
+++ b/engines/dragons/minigame3.cpp
@@ -617,7 +617,7 @@ void Minigame3::run() {
 					if ((tmpValue & 0xffff) == 0) {
 						local_1be = 1;
 					} else {
-						local_1be = 0xffff;
+						local_1be = -1;
 					}
 					local_1bc = _vm->getRand(3);
 					local_1bc = local_1bc + 3;
diff --git a/engines/dragons/specialopcodes.cpp b/engines/dragons/specialopcodes.cpp
index 7b49debee1..c4d9db40f0 100644
--- a/engines/dragons/specialopcodes.cpp
+++ b/engines/dragons/specialopcodes.cpp
@@ -1234,13 +1234,13 @@ void SpecialOpcodes::pizzaMakerStopWorking() {
 		if (actorf4->_sequenceID == 1) {
 			actorf4->waitUntilFlag8And4AreSet();
 			actorf4->updateSequence(2);
-			actorf5->_x_pos = 0x115;
-			actorf5->_y_pos = 0x5c;
+			actorf5->_x_pos = 277;
+			actorf5->_y_pos = 92;
 			actorf5->updateSequence(7);
 			_vm->waitForFrames(0x78);
 			actorf5->updateSequence(8);
 			actorf5->waitUntilFlag8And4AreSet();
-			actorf5->_x_pos = 0xff9c;
+			actorf5->_x_pos = -100;
 			actorf5->_y_pos = 100;
 			actorf4->updateSequence(3);
 		} else {
@@ -1248,7 +1248,7 @@ void SpecialOpcodes::pizzaMakerStopWorking() {
 				_vm->waitForFrames(0x78);
 				actorf5->updateSequence(8);
 				actorf5->waitUntilFlag8And4AreSet();
-				actorf5->_x_pos = 0xff9c;
+				actorf5->_x_pos = -100;
 				actorf5->_y_pos = 100;
 				actorf4->updateSequence(3);
 			} else {




More information about the Scummvm-git-logs mailing list