aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/code_wheel.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-19 22:57:31 -0500
committerPaul Gilbert2017-02-19 22:57:31 -0500
commit2d80b931b3f004265fd08c3182f94a4c5824e063 (patch)
tree72b13f5ebe790b819820b06ca3b3fc311c4aba2d /engines/titanic/game/code_wheel.h
parentc1bc64d3912f60d6c5812f1f82d196eb78d5b4f2 (diff)
downloadscummvm-rg350-2d80b931b3f004265fd08c3182f94a4c5824e063.tar.gz
scummvm-rg350-2d80b931b3f004265fd08c3182f94a4c5824e063.tar.bz2
scummvm-rg350-2d80b931b3f004265fd08c3182f94a4c5824e063.zip
WORKAROUND: Stop resetting bomb code wheels when loading savegames
The original kept resetting the bomb's code wheels whenever the view was entered, which meant reloading a savegame, you lost any progress you'd made. Presumably this was done as a quick and dirty hack in case anyone was stupid enough to rearm the bomb after fixing it the first time. I've added new code that now only resets the wheels when the bomb is initially armed, and you can now save in the bomb closeup, and it will remember all your selections
Diffstat (limited to 'engines/titanic/game/code_wheel.h')
-rw-r--r--engines/titanic/game/code_wheel.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/titanic/game/code_wheel.h b/engines/titanic/game/code_wheel.h
index ac654ff14f..3d19eeb53c 100644
--- a/engines/titanic/game/code_wheel.h
+++ b/engines/titanic/game/code_wheel.h
@@ -33,10 +33,11 @@ class CodeWheel : public CBomb {
bool EnterViewMsg(CEnterViewMsg *msg);
bool MouseButtonUpMsg(CMouseButtonUpMsg *msg);
bool MovieEndMsg(CMovieEndMsg *msg);
+ bool CheckCodeWheelsMsg(CCheckCodeWheelsMsg *msg);
private:
int _correctValue;
int _value;
- bool _isCorrect;
+ bool _matched;
// German specific fields
int _field114;
int _field118;
@@ -53,6 +54,11 @@ public:
* Load the data for the class from file
*/
virtual void load(SimpleFile *file);
+
+ /**
+ * Resets a code wheel back to the default 'O' value
+ */
+ void reset() { _value = 4; }
};
} // End of namespace Titanic