diff options
| -rw-r--r-- | engines/gob/global.h | 3 | ||||
| -rw-r--r-- | engines/gob/inter.cpp | 4 | ||||
| -rw-r--r-- | engines/gob/mult_v2.cpp | 4 | ||||
| -rw-r--r-- | engines/gob/music.h | 3 | ||||
| -rw-r--r-- | engines/gob/scenery.cpp | 3 |
5 files changed, 7 insertions, 10 deletions
diff --git a/engines/gob/global.h b/engines/gob/global.h index 14e1adcbfc..10f2d40707 100644 --- a/engines/gob/global.h +++ b/engines/gob/global.h @@ -132,8 +132,7 @@ public: Video::Color _savedPal[256]; int32 _savedBackSize; - void clearVars(uint32 count) - { + void clearVars(uint32 count) { uint32 size = count * 4; memset(_inter_variables, 0, size); diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp index b0b800b25f..128ea3f465 100644 --- a/engines/gob/inter.cpp +++ b/engines/gob/inter.cpp @@ -220,8 +220,8 @@ void Inter::funcBlock(int16 retFlag) { (startaddr == 0x0B92 && addr == 0x0C93 && // Castle !strncmp(_vm->_game->_curTotFile, "avt019.tot", 10)) || (startaddr == 0x17D9 && addr == 0x18DA && // Finale - !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10))) - { + !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10))) { + _vm->_util->longDelay(5000); } } // End of workaround diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index 980bb8ab16..82772842dd 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -893,8 +893,8 @@ void Mult_v2::animate() { if ((animObj1.newRight >= animObj2.newLeft) && (animObj2.newRight >= animObj1.newLeft) && (animObj1.newBottom >= animObj2.newTop) && - (animObj2.newBottom >= animObj1.newTop)) - { + (animObj2.newBottom >= animObj1.newTop)) { + _vm->_scenery->_toRedrawLeft = animObj2.newLeft; _vm->_scenery->_toRedrawRight = animObj2.newRight; _vm->_scenery->_toRedrawTop = animObj2.newTop; diff --git a/engines/gob/music.h b/engines/gob/music.h index 2531f36e4a..6073e1388d 100644 --- a/engines/gob/music.h +++ b/engines/gob/music.h @@ -45,8 +45,7 @@ public: void setRepeating (int32 repCount) { _repCount = repCount; } int getIndex() const { return _index; } void startPlay() { if (_data) _playing = true; } - void stopPlay() - { + void stopPlay() { Common::StackLock slock(_mutex); _playing = false; } diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index 5f9193bbe8..5548382532 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -588,8 +588,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, if (frame >= layerPtr->framesCount) return; - if (flags & 1) // Do capture - { + if (flags & 1) { // Do capture updateAnim(layer, frame, animation, 0, drawDeltaX, drawDeltaY, 0); if (_toRedrawLeft == -12345) |