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

[dreammaster]

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:
d9f8bf0bc3 M4: RIDDLE: Add a syncGame method for saving room 203 fields


Commit: d9f8bf0bc314a2f5435097ac47f93e63670d4f70
    https://github.com/scummvm/scummvm/commit/d9f8bf0bc314a2f5435097ac47f93e63670d4f70
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-12T18:31:10-08:00

Commit Message:
M4: RIDDLE: Add a syncGame method for saving room 203 fields

Changed paths:
    engines/m4/riddle/rooms/section2/room203.cpp
    engines/m4/riddle/rooms/section2/room203.h


diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index a182c839fd9..f40b1e3812f 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -3166,6 +3166,20 @@ void Room203::parser() {
 	_G(player).command_ready = false;
 }
 
+void Room203::syncGame(Common::Serializer &s) {
+	s.syncAsSint32LE(_ripleyMode);
+	s.syncAsSint32LE(_ripleyShould);
+	s.syncAsSint32LE(_oldLadyMode);
+	s.syncAsSint32LE(_oldLadyShould);
+	s.syncAsSint32LE(_peasantMode);
+	s.syncAsSint32LE(_peasantMode2);
+	s.syncAsSint32LE(_peasantShould);
+	s.syncAsSint32LE(_officialMode);
+	s.syncAsSint32LE(_officialShould);
+	s.syncAsSint32LE(_gkMode);
+	s.syncAsSint32LE(_gkShould);
+}
+
 void Room203::setupHelmetHotspot() {
 	for (HotSpotRec *hs = _G(currentSceneDef).hotspots; hs; hs = hs->next) {
 		if (!strcmp(hs->vocab, "SOLDIER'S HELMET")) {
diff --git a/engines/m4/riddle/rooms/section2/room203.h b/engines/m4/riddle/rooms/section2/room203.h
index 057613464d7..e5e40b27f44 100644
--- a/engines/m4/riddle/rooms/section2/room203.h
+++ b/engines/m4/riddle/rooms/section2/room203.h
@@ -50,6 +50,7 @@ private:
 	int _trigger5 = -1;
 	int _shadow3 = 0;
 	machine *_ripley = nullptr;
+	machine *_ripsh1 = nullptr;
 	machine *_stream1 = nullptr;
 	int _ripHeadTurn = 0;
 	int _ripLooksAtHeads = 0;
@@ -70,7 +71,8 @@ private:
 	int _ripLooksThroughHole = 0;
 	int _ripTossesHelmet = 0;
 	int _ripTossesBucket = 0;
-	machine *_ripsh1 = nullptr;
+	int _ripleyMode = 0;
+	int _ripleyShould = 0;
 	machine *_mei = nullptr;
 	int _meiTalkToRip = 0;
 	int _meiTurnAndTalk = 0;
@@ -87,7 +89,6 @@ private:
 	int _oldLadyNoHelmet = 0;
 	int _oldLadyFeedingBirds = 0;
 	int _oldLadyMode = 0, _oldLadyShould = 0;
-	int _ripleyShould = 0;
 	int _oldLady1 = 0;
 	int _oldLadyPointsToPhoto = 0;
 	int _oldLadyPhotoPopup = 0;
@@ -133,7 +134,6 @@ private:
 	int _203sg01 = 0;
 	machine *_g1 = nullptr;
 	machine *_g2 = nullptr;
-	int _ripleyMode = 0;
 	int _unkShould = 0;
 	int _oneFrameBucket = 0;
 
@@ -164,6 +164,7 @@ public:
 	void daemon() override;
 	void pre_parser() override;
 	void parser() override;
+	void syncGame(Common::Serializer &s) override;
 };
 
 } // namespace Rooms