[Scummvm-git-logs] scummvm master -> 1317a7c267a987dfe59d2816b5699759cf4a78ed

[phcoder]

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

Summary:
038704b772 HADESCH: Fix soft lock on Seriphos
9d05d350ff HADESCH: Fix bad autosave at engine launch
4cd62c6596 HADESCH: init _cheatsEnabled
1317a7c267 HADESCH: wall of fame cleanup


Commit: 038704b772c715f2fb77632fdd7a98acabbc11c3
    https://github.com/scummvm/scummvm/commit/038704b772c715f2fb77632fdd7a98acabbc11c3
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T10:53:33+01:00

Commit Message:
HADESCH: Fix soft lock on Seriphos

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


diff --git a/engines/hadesch/rooms/seriphos.cpp b/engines/hadesch/rooms/seriphos.cpp
index e255030c6f..bb116c216e 100644
--- a/engines/hadesch/rooms/seriphos.cpp
+++ b/engines/hadesch/rooms/seriphos.cpp
@@ -213,6 +213,7 @@ public:
 			room->playVideo("c7380ba0", kPhilZ, kStrawTakenCleanup, Common::Point(0, 216));
 			break;
 		case 26022:
+		case 26023:
 		case kStrawTakenCleanup:
 			room->enableMouse();
 			break;


Commit: 9d05d350ff43a153653bc10a0dfcb8cc73b6fb11
    https://github.com/scummvm/scummvm/commit/9d05d350ff43a153653bc10a0dfcb8cc73b6fb11
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T10:53:33+01:00

Commit Message:
HADESCH: Fix bad autosave at engine launch

Changed paths:
    engines/hadesch/hadesch.cpp
    engines/hadesch/hadesch.h


diff --git a/engines/hadesch/hadesch.cpp b/engines/hadesch/hadesch.cpp
index c315828f54..cfe90ad60e 100644
--- a/engines/hadesch/hadesch.cpp
+++ b/engines/hadesch/hadesch.cpp
@@ -695,6 +695,8 @@ Common::Error HadeschEngine::saveGameStream(Common::WriteStream *stream, bool is
 	Common::Serializer s(nullptr, stream);
 	if (isAutosave)
 		_persistent._slotDescription = "Autosave";
+	if(_persistent._currentRoomId == 0)
+		return Common::kUnknownError;
 	bool res = _persistent.syncGameStream(s);
 	_persistent._slotDescription = "";
 	return res ? Common::kNoError
diff --git a/engines/hadesch/hadesch.h b/engines/hadesch/hadesch.h
index 2d9f69a47c..4b1e485a2a 100644
--- a/engines/hadesch/hadesch.h
+++ b/engines/hadesch/hadesch.h
@@ -112,7 +112,7 @@ public:
 	bool hasFeature(EngineFeature f) const override;
 
 	bool canLoadGameStateCurrently() override { return true; }
-	bool canSaveGameStateCurrently() override { return true; }
+	bool canSaveGameStateCurrently() override { return _persistent._currentRoomId != 0; }
 	Common::Error loadGameStream(Common::SeekableReadStream *stream) override;
 	Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override;
 


Commit: 4cd62c65967e9b1b3fc563cf11d7e4342eed7fa7
    https://github.com/scummvm/scummvm/commit/4cd62c65967e9b1b3fc563cf11d7e4342eed7fa7
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T10:53:33+01:00

Commit Message:
HADESCH: init _cheatsEnabled

Changed paths:
    engines/hadesch/hadesch.cpp


diff --git a/engines/hadesch/hadesch.cpp b/engines/hadesch/hadesch.cpp
index cfe90ad60e..fd3dced3b2 100644
--- a/engines/hadesch/hadesch.cpp
+++ b/engines/hadesch/hadesch.cpp
@@ -72,7 +72,7 @@ static const uint32 cursorids[] = {
 };
 
 HadeschEngine::HadeschEngine(OSystem *system, const ADGameDescription *desc)
-	: Engine(system), _desc(desc), _rnd("hadesch") {
+	: Engine(system), _desc(desc), _rnd("hadesch"), _cheatsEnabled(false) {
 
 	DebugMan.addDebugChannel(kHadeschDebugGeneral, "general", "General issues");
 	DebugMan.addDebugChannel(kHadeschDebugMessagingSystem, "resources", "Resources");


Commit: 1317a7c267a987dfe59d2816b5699759cf4a78ed
    https://github.com/scummvm/scummvm/commit/1317a7c267a987dfe59d2816b5699759cf4a78ed
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-27T10:53:33+01:00

Commit Message:
HADESCH: wall of fame cleanup

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


diff --git a/engines/hadesch/rooms/walloffame.cpp b/engines/hadesch/rooms/walloffame.cpp
index 104e7f698d..14148f2701 100644
--- a/engines/hadesch/rooms/walloffame.cpp
+++ b/engines/hadesch/rooms/walloffame.cpp
@@ -92,6 +92,7 @@ static const char *kPhilFirstQuest = "phil first quest";
 static const char *kPhilDaedalusNeedsHelp = "phil daedalus needs help";
 static const char *kPhilOffToCrete = "phil off to crete";
 static const char *kPhilArgo = "phil argo";
+#define kPhilTapsFootLeft "phil taps foot left"
 
 #define kPhilYapsWithoutSound "phil yaps without sound"
 
@@ -129,7 +130,7 @@ static const char *allPhils[] = {
 	kPhilWalksCenterToLeft,
 	"phil faces backward left",
 	kPhilSighsLeft,
-	"phil taps foot left",
+	kPhilTapsFootLeft,
 	"phil dusts left",
 	"phil dusts center",
 	kPhilSnores,
@@ -645,7 +646,7 @@ public:
 				break;
 			case 9:
 				// state 48
-				playPhilAnim("phil taps foot left", kPhilJokeEventCleanup);
+				playPhilAnim(kPhilTapsFootLeft, kPhilJokeEventCleanup);
 				break;
 			case 10:
 				// state 49, dusts
@@ -1097,7 +1098,7 @@ private:
 	void cancelAllPhils() {
 		Common::SharedPtr<VideoRoom> room = g_vm->getVideoRoom();
 
-		for (uint i = 0; i < sizeof(allPhils) / sizeof (allPhils[0]); i++)
+		for (uint i = 0; i < ARRAYSIZE(allPhils); i++)
 			room->stopAnim(allPhils[i]);
 	}