diff options
| author | Strangerke | 2014-01-07 07:26:53 +0100 |
|---|---|---|
| committer | Strangerke | 2014-01-07 07:27:29 +0100 |
| commit | e6e8008e67224f4a45f9965d1e00cb3da5f9652a (patch) | |
| tree | b0844906d33159ab5696da75aef0c6345766df0e /engines/voyeur | |
| parent | 3eff4af3c514f75eaa6e91ab94fd644d69557341 (diff) | |
| download | scummvm-rg350-e6e8008e67224f4a45f9965d1e00cb3da5f9652a.tar.gz scummvm-rg350-e6e8008e67224f4a45f9965d1e00cb3da5f9652a.tar.bz2 scummvm-rg350-e6e8008e67224f4a45f9965d1e00cb3da5f9652a.zip | |
VOYEUR: Change some more types, add comments about unused variables
Diffstat (limited to 'engines/voyeur')
| -rw-r--r-- | engines/voyeur/events.cpp | 12 | ||||
| -rw-r--r-- | engines/voyeur/events.h | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index ba86ba8f58..deaa978a46 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -57,8 +57,8 @@ IntData::IntData() { field26 = 0; field2A = 0; field38 = false; - field3B = 0; - field3D = 0; + field3B = false; + field3D = false; _palStartIndex = 0; _palEndIndex = 0; _palette = NULL; @@ -168,13 +168,13 @@ void EventsManager::voyeurTimer() { // _gameData.field1C += _gameData._timerFn; *** WHY INC field by a function pointer?! _gameData.field16 = 0; - _gameData.field3D = 1; + _gameData.field3D = true; if (--_gameData.field26 <= 0) { if (_gameData._flipWait) { _gameData.field38 = true; _gameData._flipWait = false; - _gameData.field3B = 0; + _gameData.field3B = false; } _gameData.field26 >>= 8; @@ -317,7 +317,7 @@ void EventsManager::startFade(CMapResource *cMap) { } if (cMap->_fadeStatus & 2) - _intPtr.field3B = 1; + _intPtr.field3B = true; _fadeIntNode._flags &= ~1; } else { byte *vgaP = &_vm->_graphicsManager._VGAColors[_fadeFirstCol * 3]; @@ -359,7 +359,7 @@ void EventsManager::addFadeInt() { } void EventsManager::vDoFadeInt() { - if (_intPtr.field3B & 1) + if (_intPtr.field3B) return; if (--_fadeCount == 0) { _fadeIntNode._flags |= 1; diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h index d2909542e6..3c474aaded 100644 --- a/engines/voyeur/events.h +++ b/engines/voyeur/events.h @@ -52,19 +52,19 @@ public: class IntData { public: - bool _field9; + bool _field9; // CHECKME: Useless variable bool _flipWait; - int field16; + int field16; // CHECKME: Useless variable int field1A; int field1E; - int field22; - int field24; + int field22; // CHECKME: Useless variable + int field24; // CHECKME: Useless variable int field26; - int field2A; + int field2A; // CHECKME: Useless variable bool _hasPalette; - bool field38; - int field3B; - int field3D; + bool field38; // CHECKME: Useless variable + bool field3B; // Skip fading + bool field3D; // CHECKME: Useless variable int _palStartIndex; int _palEndIndex; byte *_palette; |