[Scummvm-cvs-logs] scummvm master -> ed52f7160d2d7f385b17b14f75fcae35310e9752
Strangerke
Strangerke at scummvm.org
Thu Mar 6 08:12:02 CET 2014
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:
ed52f7160d VOYEUR: Remove _field26 from the event timer
Commit: ed52f7160d2d7f385b17b14f75fcae35310e9752
https://github.com/scummvm/scummvm/commit/ed52f7160d2d7f385b17b14f75fcae35310e9752
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-05T23:10:17-08:00
Commit Message:
VOYEUR: Remove _field26 from the event timer
Changed paths:
engines/voyeur/events.cpp
engines/voyeur/events.h
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 36e015d..4c1ed41 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 11711d2..5e0bfe6 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;
More information about the Scummvm-git-logs
mailing list