[Scummvm-git-logs] scummvm master -> 46b3388aa087b666c37709aa833c086a98a8cd29

[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:
46b3388aa0 M4: RIDDLE: rename _buttonDown in two classes, initialize some members


Commit: 46b3388aa087b666c37709aa833c086a98a8cd29
    https://github.com/scummvm/scummvm/commit/46b3388aa087b666c37709aa833c086a98a8cd29
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-05T08:58:42+02:00

Commit Message:
M4: RIDDLE: rename _buttonDown in two classes, initialize some members

Changed paths:
    engines/m4/riddle/rooms/section9/room903.cpp
    engines/m4/riddle/rooms/section9/room903.h
    engines/m4/riddle/rooms/section9/room905.h
    engines/m4/riddle/rooms/section9/room906.cpp
    engines/m4/riddle/rooms/section9/room906.h


diff --git a/engines/m4/riddle/rooms/section9/room903.cpp b/engines/m4/riddle/rooms/section9/room903.cpp
index c74a6f5aa1c..1ec06c4f455 100644
--- a/engines/m4/riddle/rooms/section9/room903.cpp
+++ b/engines/m4/riddle/rooms/section9/room903.cpp
@@ -113,9 +113,9 @@ void Room903::daemon() {
 	}
 
 	if (_G(MouseState).ButtonState)
-		buttonDown = true;
-	else if (buttonDown) {
-		buttonDown = false;
+		_buttonDown = true;
+	else if (_buttonDown) {
+		_buttonDown = false;
 		disable_player_commands_and_fade_init(55);
 	}
 }
diff --git a/engines/m4/riddle/rooms/section9/room903.h b/engines/m4/riddle/rooms/section9/room903.h
index 2d8472158ee..e85654e032c 100644
--- a/engines/m4/riddle/rooms/section9/room903.h
+++ b/engines/m4/riddle/rooms/section9/room903.h
@@ -39,7 +39,7 @@ public:
 
 private:
 	machine *_roomStates_field4 = nullptr;
-	bool buttonDown = false;
+	bool _buttonDown = false;
 	static void escapePressed(void *, void *);
 };
 
diff --git a/engines/m4/riddle/rooms/section9/room905.h b/engines/m4/riddle/rooms/section9/room905.h
index 053a1002459..e16d72eb50a 100644
--- a/engines/m4/riddle/rooms/section9/room905.h
+++ b/engines/m4/riddle/rooms/section9/room905.h
@@ -41,7 +41,7 @@ public:
 
 
 private:
-	int _roomStates_field4;
+	int _roomStates_field4 = -1;
 	static void escapePressed(void *, void *);
 	machine *_roomStates_tt = nullptr;
 };
diff --git a/engines/m4/riddle/rooms/section9/room906.cpp b/engines/m4/riddle/rooms/section9/room906.cpp
index 1a3cadc759c..35ff971f5b7 100644
--- a/engines/m4/riddle/rooms/section9/room906.cpp
+++ b/engines/m4/riddle/rooms/section9/room906.cpp
@@ -93,9 +93,9 @@ void Room906::daemon() {
 	}
 
 	if (_G(MouseState).ButtonState)
-		buttonDown = true;
-	else if (buttonDown) {
-		buttonDown = false;
+		_buttonDown = true;
+	else if (_buttonDown) {
+		_buttonDown = false;
 		disable_player_commands_and_fade_init(55);
 	}
 }
diff --git a/engines/m4/riddle/rooms/section9/room906.h b/engines/m4/riddle/rooms/section9/room906.h
index ae0313ca161..9562c998d6b 100644
--- a/engines/m4/riddle/rooms/section9/room906.h
+++ b/engines/m4/riddle/rooms/section9/room906.h
@@ -40,9 +40,9 @@ public:
 
 private:
 	static void escapePressed(void *, void *);
-	int _roomStates_pu;
-	machine *_roomStates_field4;
-	bool buttonDown = false;
+	int _roomStates_pu = -1;
+	machine *_roomStates_field4 = nullptr;
+	bool _buttonDown = false;
 };
 
 } // namespace Rooms