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

[phcoder]

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

Summary:
8f79623e63 HADESCH: Fix dismissing of troy popup grate
a02f602dfb HADESCH: Fix access violation in Athena's temple


Commit: 8f79623e63d9177688eaeb9b1a3e75d77cca654c
    https://github.com/scummvm/scummvm/commit/8f79623e63d9177688eaeb9b1a3e75d77cca654c
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T00:57:21+01:00

Commit Message:
HADESCH: Fix dismissing of troy popup grate

Changed paths:
    engines/hadesch/rooms/troy.cpp


diff --git a/engines/hadesch/rooms/troy.cpp b/engines/hadesch/rooms/troy.cpp
index af334f4f4c..608180ef98 100644
--- a/engines/hadesch/rooms/troy.cpp
+++ b/engines/hadesch/rooms/troy.cpp
@@ -319,8 +319,8 @@ public:
 			room->disableHotzone("Catacomb PopUp");
 			room->stopAnim("t1010oe0");
 			room->stopAnim("t1290bb0");
-			room->enableHotzone("Link To Catacombs");
-			room->enableHotzone("Catacomb PopUp Grate");
+			room->disableHotzone("Link To Catacombs");
+			room->disableHotzone("Catacomb PopUp Grate");
 			// TODO: schedule 10023
 			return;
 		}


Commit: a02f602dfbfe95aa3c2ea673621f7afdedcb153f
    https://github.com/scummvm/scummvm/commit/a02f602dfbfe95aa3c2ea673621f7afdedcb153f
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T00:57:21+01:00

Commit Message:
HADESCH: Fix access violation in Athena's temple

Changed paths:
    engines/hadesch/rooms/athena.cpp


diff --git a/engines/hadesch/rooms/athena.cpp b/engines/hadesch/rooms/athena.cpp
index 07a2c89947..808f65411c 100644
--- a/engines/hadesch/rooms/athena.cpp
+++ b/engines/hadesch/rooms/athena.cpp
@@ -193,7 +193,7 @@ public:
 		case 23007:
 			handleEvent(23010);
 			_hintTimerLength = 40000;
-			rescheduleHintTimer();
+			rescheduleHintTimer(true);
 			break;
 		case 23008:
 			room->playAnim("c8140ba0", 1101, PlayAnimParams::disappear(), 23015);
@@ -327,10 +327,11 @@ public:
 		g_vm->getHeroBelt()->setColour(HeroBelt::kCool);
 	}
 private:
-	void rescheduleHintTimer() {
+	void rescheduleHintTimer(bool isInHandler = false) {
 		Persistent *persistent = g_vm->getPersistent();
 
-		g_vm->cancelTimer(23007);
+		if (!isInHandler)
+			g_vm->cancelTimer(23007);
 		if (!persistent->_athenaPuzzleSolved)
 			g_vm->addTimer(23007, _hintTimerLength);
 	}