[Scummvm-git-logs] scummvm master -> 89e8b823b05299f143e835ea0bbad6aa386400b7

[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:
89e8b823b0 DRAGONS: Fix Set-But-Unused Variable GCC Compiler Warnings


Commit: 89e8b823b05299f143e835ea0bbad6aa386400b7
    https://github.com/scummvm/scummvm/commit/89e8b823b05299f143e835ea0bbad6aa386400b7
Author: D G Turner (digitall at scummvm.org)
Date: 2020-05-09T06:32:50+01:00

Commit Message:
DRAGONS: Fix Set-But-Unused Variable GCC Compiler Warnings

Changed paths:
    engines/dragons/minigame2.cpp
    engines/dragons/minigame3.cpp
    engines/dragons/minigame5.cpp


diff --git a/engines/dragons/minigame2.cpp b/engines/dragons/minigame2.cpp
index 53c91cc6e6..f45ef6bb25 100644
--- a/engines/dragons/minigame2.cpp
+++ b/engines/dragons/minigame2.cpp
@@ -58,7 +58,6 @@ static const uint16 unkArray[5] = {
 void Minigame2::run(int16 param_1, uint16 param_2, int16 param_3) {
 	short sVar2;
 	short sVar3;
-	bool shouldExit;
 	bool bVar4;
 	DragonINI *flicker;
 	uint32 origEngineFlags;
@@ -131,7 +130,6 @@ void Minigame2::run(int16 param_1, uint16 param_2, int16 param_3) {
 	textIdTbl[2] = 0x4576;
 
 	bVar4 = false;
-	shouldExit = false;
 	local_27a = 0;
 	local_278 = 0;
 	local_272 = 0;
diff --git a/engines/dragons/minigame3.cpp b/engines/dragons/minigame3.cpp
index e16e71964d..df7b476f70 100644
--- a/engines/dragons/minigame3.cpp
+++ b/engines/dragons/minigame3.cpp
@@ -71,7 +71,7 @@ void Minigame3::run() {
 	DragonINI *flicker;
 	uint16 origSceneId;
 	//byte auStack1584_palette[512]; //[126];
-	uint16 local_5b2;
+	//uint16 local_5b2;
 	//byte auStack1072_palette[512];
 	Actor *bunnyActorTbl[4];
 	uint16 local_228;
@@ -196,7 +196,7 @@ void Minigame3::run() {
 // TODO
 //	memcpy2(auStack1584_palette, scrFileData_maybe, 0x200);
 //	memcpy2(auStack1072_palette, scrFileData_maybe, 0x200);
-	local_5b2 = 0x7fff;
+//	local_5b2 = 0x7fff;
 //	DisableVSyncEvent();
 	int i = 0;
 	while ((int16)i < 4) {
diff --git a/engines/dragons/minigame5.cpp b/engines/dragons/minigame5.cpp
index 172c267b55..21ec98c883 100644
--- a/engines/dragons/minigame5.cpp
+++ b/engines/dragons/minigame5.cpp
@@ -50,7 +50,7 @@ void Minigame5::run() {
 	uint16 local_850;
 	uint16 auStack2120 [1000];
 	DragonINI*local_78;
-	uint16 local_76;
+	//uint16 local_76;
 	uint16 local_74;
 	uint16 local_72;
 	uint16 bombScale;
@@ -68,11 +68,11 @@ void Minigame5::run() {
 	uint16 currentState;
 	short local_50;
 	Actor *local_4e;
-	uint16 local_4c;
-	uint16 local_4a;
-	uint16 local_48;
+	//uint16 local_4c;
+	//uint16 local_4a;
+	//uint16 local_48;
 	int16 local_46;
-	int16 local_44;
+	//int16 local_44;
 	short local_42;
 	uint16 local_30 [4];
 	//uint16 uStack42;
@@ -95,8 +95,8 @@ void Minigame5::run() {
 
 	fd->close();
 
-	local_48 = 0;
-	local_76 = _vm->_scene->getSceneId();
+	//local_48 = 0;
+	//local_76 = _vm->_scene->getSceneId();
 	local_78 = _vm->_dragonINIResource->getFlickerRecord();
 	local_78->actor->setFlag(ACTOR_FLAG_100);
 	local_78->actor->_priorityLayer = 0;
@@ -160,8 +160,8 @@ void Minigame5::run() {
 	dustActor->_flags = dustActor->_flags | 0x380;
 	dustActor->_scale = DRAGONS_ENGINE_SPRITE_100_PERCENT_SCALE;
 	local_4e = _vm->_dragonINIResource->getRecord(DAT_80063a48 + -1)->actor;
-	local_4c = 0;
-	local_4a = local_4e->_sequenceTimerMaxValue;
+	//local_4c = 0;
+	//local_4a = local_4e->_sequenceTimerMaxValue;
 	_vm->setFlags(ENGINE_FLAG_4000000);
 	currentState = 1;
 	local_66 = 0;
@@ -328,7 +328,7 @@ void Minigame5::run() {
 							}
 						} else {
 							local_4e->_sequenceTimerMaxValue = 2;
-							local_4c = 0x3c;
+							//local_4c = 0x3c;
 							bombActor->_priorityLayer = 0;
 							currentState = 8;
 						}
@@ -382,7 +382,7 @@ void Minigame5::run() {
 					_vm->_talk->displayDialogAroundPoint(auStack2120, (int)(short)(local_850 >> 3), 0xc, 0, 1, DAT_8006391c);
 					pusherActor->_flags = pusherActor->_flags | 0x1000;
 					local_10 = 2;
-					local_48 = 1;
+					//local_48 = 1;
 					currentState = 6;
 					break;
 				default:
@@ -488,11 +488,11 @@ void Minigame5::run() {
 //			callMaybeResetData();
 			flickerActor->updateSequence(0x15);
 			local_46 = 0;
-			local_44 = 0;
+			//local_44 = 0;
 			if (local_10 == 2) {
 //				DisableVSyncEvent();
 				local_46 = pusherActor->_x_pos;
-				local_44 = pusherActor->_y_pos;
+				//local_44 = pusherActor->_y_pos;
 				pusherActor->reset_maybe();
 //				EnableVSyncEvent();
 			} else {