aboutsummaryrefslogtreecommitdiff
path: root/engines/simon/simon.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/simon/simon.h')
-rw-r--r--engines/simon/simon.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index e2795a99ec..f067a716f8 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -262,10 +262,6 @@ protected:
bool _speech;
bool _subtitles;
bool _fade;
- byte _animatePointer;
- byte _mouseCursor;
- byte _mouseAnim;
- byte _mouseAnimMax;
bool _vgaVar9;
int16 _scriptUnk1;
bool _restoreWindow6;
@@ -297,7 +293,6 @@ protected:
uint _needHitAreaRecalc;
uint _verbHitArea;
uint16 _defaultVerb;
- uint _mouseHideCount;
uint _currentBoxNumber;
uint _iOverflow;
@@ -317,6 +312,11 @@ protected:
int _mouseX, _mouseY;
int _mouseXOld, _mouseYOld;
+ byte _animatePointer;
+ byte _mouseCursor, _mouseAnim, _mouseAnimMax;
+ byte _oldMouseCursor, _oldMouseAnimMax;
+ uint _mouseHideCount;
+
byte _leftButtonDown;
byte _rightButtonDown;
bool _noRightClick;
@@ -568,7 +568,7 @@ protected:
HitArea *findEmptyHitArea();
void resetVerbs();
void setVerb(HitArea * ha);
- void hitarea_leave(HitArea * ha);
+ void hitarea_leave(HitArea * ha, bool state = false);
void leaveHitAreaById(uint hitarea_id);
void waitForSync(uint a);
@@ -650,6 +650,7 @@ protected:
void displayName(HitArea * ha);
void displayBoxStars();
void hitarea_stuff();
+ void invertBox(HitArea *ha, bool state);
void handleMouseMoved();
void pollMouseXY();