aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur
diff options
context:
space:
mode:
authorStrangerke2014-03-06 08:10:17 +0100
committerStrangerke2014-03-06 08:10:17 +0100
commited52f7160d2d7f385b17b14f75fcae35310e9752 (patch)
treefabb9c6965a60e4e0bd63899e633ecbc4e569ce7 /engines/voyeur
parent0362f41024880a92ce6e49d492eb0ff0a55d6a6d (diff)
downloadscummvm-rg350-ed52f7160d2d7f385b17b14f75fcae35310e9752.tar.gz
scummvm-rg350-ed52f7160d2d7f385b17b14f75fcae35310e9752.tar.bz2
scummvm-rg350-ed52f7160d2d7f385b17b14f75fcae35310e9752.zip
VOYEUR: Remove _field26 from the event timer
Diffstat (limited to 'engines/voyeur')
-rw-r--r--engines/voyeur/events.cpp11
-rw-r--r--engines/voyeur/events.h1
2 files changed, 3 insertions, 9 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 36e015df43..4c1ed419a2 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -52,7 +52,6 @@ IntData::IntData() {
_hasPalette = false;
_flashTimer = 0;
_flashStep = 0;
- field26 = 0;
_skipFading = false;
_palStartIndex = 0;
_palEndIndex = 0;
@@ -185,13 +184,9 @@ void EventsManager::showMousePosition() {
void EventsManager::voyeurTimer() {
_gameData._flashTimer += _gameData._flashStep;
- if (--_gameData.field26 <= 0) {
- if (_gameData._flipWait) {
- _gameData._flipWait = false;
- _gameData._skipFading = false;
- }
-
- _gameData.field26 >>= 8;
+ if (_gameData._flipWait) {
+ _gameData._flipWait = false;
+ _gameData._skipFading = false;
}
videoTimer();
diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 11711d22fc..5e0bfe6404 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -55,7 +55,6 @@ public:
bool _flipWait;
int _flashTimer;
int _flashStep;
- int field26;
bool _hasPalette;
bool _skipFading;
int _palStartIndex;