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

[Strangerke]

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:
df3008752f GOT: Remove residual code related (in the original code) to use_hourglass()


Commit: df3008752f4af44823c8ac28107f248b1b66ad66
    https://github.com/scummvm/scummvm/commit/df3008752f4af44823c8ac28107f248b1b66ad66
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-01-25T08:42:28+01:00

Commit Message:
GOT: Remove residual code related (in the original code) to use_hourglass()

Changed paths:
    engines/got/game/boss1.cpp
    engines/got/game/boss2.cpp
    engines/got/game/main.cpp
    engines/got/game/object.cpp
    engines/got/got.cpp
    engines/got/vars.h
    engines/got/views/game_content.cpp


diff --git a/engines/got/game/boss1.cpp b/engines/got/game/boss1.cpp
index 52387317b51..e454948eff4 100644
--- a/engines/got/game/boss1.cpp
+++ b/engines/got/game/boss1.cpp
@@ -59,10 +59,7 @@ int boss1Movement(Actor *actor) {
 		if (!actor->_temp3)
 			playSound(BOSS11, false);
 
-		if (_G(hourglass_flag))
-			actor->_numMoves = 3;
-		else
-			actor->_numMoves = 6;
+		actor->_numMoves = 6;
 
 		goto done0;
 	}
@@ -214,7 +211,6 @@ void boss1SetupLevel() {
 }
 
 static int boss1_dead() {
-	_G(hourglass_flag) = 0;
 	if (_G(boss_dead)) {
 		for (int rep = 0; rep < 4; rep++) {
 			const int x1 = _G(actor[3 + rep])._lastX[_G(pge)];
diff --git a/engines/got/game/boss2.cpp b/engines/got/game/boss2.cpp
index 973eb7f5683..9f19a677df5 100644
--- a/engines/got/game/boss2.cpp
+++ b/engines/got/game/boss2.cpp
@@ -222,7 +222,6 @@ void boss2SetupLevel() {
 }
 
 static int boss2Die() {
-	_G(hourglass_flag) = 0;
 	_G(thunder_flag) = 0;
 	if (_G(boss_dead)) {
 		for (int rep = 0; rep < 4; rep++) {
diff --git a/engines/got/game/main.cpp b/engines/got/game/main.cpp
index a949bd4457b..a2c4c19650f 100644
--- a/engines/got/game/main.cpp
+++ b/engines/got/game/main.cpp
@@ -52,7 +52,6 @@ void setupLoad() {
 	_G(thor)->_numMoves = 1;
 	_G(thor)->_vulnerableCountdown = 60;
 	_G(thor)->_show = 60;
-	_G(hourglass_flag) = 0;
 	_G(apple_flag) = false;
 	_G(bomb_flag) = false;
 	_G(thunder_flag) = 0;
diff --git a/engines/got/game/object.cpp b/engines/got/game/object.cpp
index e604b5d399d..56a9aeaf8fa 100644
--- a/engines/got/game/object.cpp
+++ b/engines/got/game/object.cpp
@@ -138,7 +138,6 @@ void pickUpObject(int p) {
 	case 30:
 	case 31:
 	case 32: {
-		_G(hourglass_flag) = 0;
 		_G(thunder_flag) = 0;
 		_G(shield_on) = false;
 		_G(lightning_used) = false;
diff --git a/engines/got/got.cpp b/engines/got/got.cpp
index 650dc8c5896..2a5791aa030 100644
--- a/engines/got/got.cpp
+++ b/engines/got/got.cpp
@@ -229,7 +229,6 @@ void GotEngine::pauseEngineIntern(bool pause) {
 
 	_G(lightning_used) = false;
 	_G(thunder_flag) = 0;
-	_G(hourglass_flag) = 0;
 
 	Engine::pauseEngineIntern(pause);
 }
diff --git a/engines/got/vars.h b/engines/got/vars.h
index 639eeddda14..8aec8fd3795 100644
--- a/engines/got/vars.h
+++ b/engines/got/vars.h
@@ -174,9 +174,11 @@ public:
 
 	bool _warpFlag = false;
 
-	int _rand1 = 0, _rand2 = 0;
-	int _hourglass_flag = 0, _thunder_flag = 0;
-	bool _lightning_used = false, _tornado_used = false;
+	int _rand1 = 0;
+	int _rand2 = 0;
+	int _thunder_flag = 0;
+	bool _lightning_used = false;
+	bool _tornado_used = false;
 	bool _shield_on = false;
 	bool _apple_flag = false;
 	bool _bomb_flag = false;
diff --git a/engines/got/views/game_content.cpp b/engines/got/views/game_content.cpp
index cad31283a47..84b13c0f96f 100644
--- a/engines/got/views/game_content.cpp
+++ b/engines/got/views/game_content.cpp
@@ -354,10 +354,6 @@ void GameContent::checkForItem() {
 void GameContent::moveActors() {
 	for (int i = 0; i < MAX_ACTORS; i++) {
 		if (_G(actor[i])._active) {
-			if (_G(hourglass_flag))
-				if ((i > 2) && (!_G(pge)) && (!(_G(actor[i])._magicHurts & LIGHTNING_MAGIC)))
-					continue;
-
 			_G(actor[i])._moveCount = _G(actor[i])._numMoves;
 			while (_G(actor[i])._moveCount--)
 				moveActor(&_G(actor[i]));
@@ -544,7 +540,6 @@ void GameContent::thorDead() {
 	_G(thor)->_numMoves = 1;
 	_G(thor)->_vulnerableCountdown = 60;
 	_G(thor)->_show = 60;
-	_G(hourglass_flag) = 0;
 	_G(apple_flag) = false;
 	_G(bomb_flag) = false;
 	_G(thunder_flag) = 0;