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

[digitall]

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:
de7d1f9f02 DRAGONS: Fix Remaining GCC Compiler Warnings


Commit: de7d1f9f0211136134dd974921869914e7656db6
    https://github.com/scummvm/scummvm/commit/de7d1f9f0211136134dd974921869914e7656db6
Author: D G Turner (digitall at scummvm.org)
Date: 2020-05-15T07:07:31+01:00

Commit Message:
DRAGONS: Fix Remaining GCC Compiler Warnings

Changed paths:
    engines/dragons/background.cpp
    engines/dragons/minigame3.cpp
    engines/dragons/talk.cpp


diff --git a/engines/dragons/background.cpp b/engines/dragons/background.cpp
index 3da2e5264f..84a6c432b7 100644
--- a/engines/dragons/background.cpp
+++ b/engines/dragons/background.cpp
@@ -396,9 +396,9 @@ uint16 ScaleLayer::getScale(uint16 y) {
 			if (local_v0_368 != 0) {
 				iVar3 = ((uVar5 & 0xffffu) - (uVar7 & 0xffffu)) * (uint)(uint16)(y - pSVar6->_y);
 
-				assert(((uint16)local_v0_368 != 0xffffu) || (iVar3 != -0x80000000));
+				assert(((uint16)local_v0_368 != 0xffffu) || (iVar3 != (int)-0x80000000));
 
-				return uVar7 + iVar3 / (int)(uint)(uint16)local_v0_368 & 0xffff;
+				return (uVar7 + iVar3 / (int)(uint)(uint16)local_v0_368) & 0xffff;
 			}
 		}
 	}
diff --git a/engines/dragons/minigame3.cpp b/engines/dragons/minigame3.cpp
index c1fefb8912..5159ec1a28 100644
--- a/engines/dragons/minigame3.cpp
+++ b/engines/dragons/minigame3.cpp
@@ -380,8 +380,8 @@ void Minigame3::run() {
 						bunnyActorTbl[local_1a]->_y_pos = (int16)((int)bunnyInfo[local_1e].y >> 9);
 						if ((local_228 < 4) && unkXPosTbl[local_50 * 4 + local_228] < bunnyActorTbl[local_1a]->_x_pos) {
 							local_228 = local_228 + 1;
-							bunnyActorTbl[local_1a]->updateSequence((uint)local_228 + 6 & 0xffff);
-							bunnyActorTbl[local_1c]->updateSequence((uint)local_228 + 0xd & 0xffff);
+							bunnyActorTbl[local_1a]->updateSequence(((uint)local_228 + 6) & 0xffff);
+							bunnyActorTbl[local_1c]->updateSequence(((uint)local_228 + 0xd) & 0xffff);
 						}
 					}
 				}
diff --git a/engines/dragons/talk.cpp b/engines/dragons/talk.cpp
index 514ef6652c..2a3fdb7aa6 100644
--- a/engines/dragons/talk.cpp
+++ b/engines/dragons/talk.cpp
@@ -348,7 +348,7 @@ uint8 Talk::conversation_related_maybe(uint16 *dialogText, uint16 x, uint16 y, u
 			if (0x16 < (short)uVar19) {
 				uVar19 = 0x16;
 			}
-			uVar11 = sVar20 * _dat_800726ec_tfont_field0 + 3 & 0xfffe;
+			uVar11 = (sVar20 * _dat_800726ec_tfont_field0 + 3) & 0xfffe;
 			sVar20 = (short)uVar11 >> 1;
 			if ((short)x < 0x14) {
 				_dat_8008e7e8_dialogBox_x1 = (x - sVar20) + 1;
@@ -694,7 +694,7 @@ TalkDialogEntry *Talk::displayTalkDialogMenu(Common::Array<TalkDialogEntry*> dia
 			uVar3 = (uint)uVar8;
 		} while (uVar8 < numEntries);
 	}
-	drawDialogBox(1, 0x17 - (uint) local_58 & 0xffff, 0x26, 0x18, 1);
+	drawDialogBox(1, (0x17 - (uint) local_58) & 0xffff, 0x26, 0x18, 1);
 	uVar8 = 0;
 	_vm->_cursor->updateSequenceID(3);
 	local_50 = -2;