diff options
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 14 | ||||
| -rw-r--r-- | engines/voyeur/graphics.cpp | 14 | ||||
| -rw-r--r-- | engines/voyeur/voyeur_game.cpp | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 3ab3067762..42446f72b7 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -690,7 +690,7 @@ void ThreadResource::parsePlayCommands() { const byte *ThreadResource::cardPerform(const byte *card) { uint16 id = *card++; - int varD = 5; + int subId = 5; uint32 v2; byte bVal; uint32 idx1, idx2; @@ -805,17 +805,17 @@ const byte *ThreadResource::cardPerform(const byte *card) { case 24: case 27: case 28: - varD -= 3; + subId -= 3; // Deliberate fall-through case 21: case 22: case 25: case 26: - bVal = card[varD]; + bVal = card[subId]; if (bVal == 61) { if (cardPerform2(card, id)) { - card += varD; + card += subId; while (*card != 30 && *card != 29) card = cardPerform(card); @@ -830,7 +830,7 @@ const byte *ThreadResource::cardPerform(const byte *card) { } } } else { - card += varD; + card += subId; int count = 1; while (count > 0) { card = getNextRecord(card); @@ -848,11 +848,11 @@ const byte *ThreadResource::cardPerform(const byte *card) { ++card; } else { if (cardPerform2(card, id)) { - card += varD; + card += subId; card = cardPerform(card); while (*card++ != 61) ; } else { - card += varD; + card += subId; while (*card != 61 && *card != 29) ++card; } diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp index 6a979dba41..831ca81fc9 100644 --- a/engines/voyeur/graphics.cpp +++ b/engines/voyeur/graphics.cpp @@ -111,7 +111,7 @@ void GraphicsManager::addRectNoSaveBack(ViewPortResource *viewPort, int idx, con void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *destDisplay, const Common::Point &initialOffset) { - int var4C = 0; + int imageDataShift = 0; int width1, width2; int widthDiff, widthDiff2; int height1; @@ -242,19 +242,19 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des } if (srcFlags & DISPFLAG_1000) { - srcImgData = srcPic->_imgData + (var4C << 14); + srcImgData = srcPic->_imgData + (imageDataShift << 14); for (uint idx = 0; idx < srcPic->_maskData; ++idx) { - if (var4C < 4) - ++var4C; + if (imageDataShift < 4) + ++imageDataShift; } } else { srcImgData = srcPic->_imgData; } if (destFlags & DISPFLAG_1000) { - destImgData = destPic->_imgData + (var4C << 14); + destImgData = destPic->_imgData + (imageDataShift << 14); for (uint idx = 0; idx < srcPic->_maskData; ++idx) { - if (var4C < 4) - ++var4C; + if (imageDataShift < 4) + ++imageDataShift; } } else { destImgData = destPic->_imgData; diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp index 07003acfe3..123f0f629b 100644 --- a/engines/voyeur/voyeur_game.cpp +++ b/engines/voyeur/voyeur_game.cpp @@ -472,15 +472,15 @@ void VoyeurEngine::reviewTape() { _currentVocId = 151; _voy._vocSecondsOffset = 0; - bool var1E = true; + bool needRedraw = true; do { if (_currentVocId != -1 && !_soundManager.getVOCStatus()) { _voy._musicStartTime = _voy._RTVNum; _soundManager.startVOCPlay(_currentVocId); } - if (var1E) { - var1E = false; + if (needRedraw) { + needRedraw = false; flipPageAndWait(); _graphicsManager._drawPtr->_penColor = 0; @@ -595,7 +595,7 @@ void VoyeurEngine::reviewTape() { case 2: if (eventStart > 0) { --eventStart; - var1E = true; + needRedraw = true; } foundIndex = -1; break; @@ -605,7 +605,7 @@ void VoyeurEngine::reviewTape() { eventStart -= 8; if (eventStart < 0) eventStart = 0; - var1E = true; + needRedraw = true; } foundIndex = -1; break; @@ -613,7 +613,7 @@ void VoyeurEngine::reviewTape() { case 4: if ((_voy._eventCount - 8) > eventStart) { ++eventStart; - var1E = true; + needRedraw = true; } foundIndex = -1; break; @@ -623,7 +623,7 @@ void VoyeurEngine::reviewTape() { eventStart += 8; if ((_voy._eventCount - 8) < eventStart) eventStart = _voy._eventCount - 8; - var1E = true; + needRedraw = true; } foundIndex = -1; break; |