aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/game_v2.cpp
diff options
context:
space:
mode:
authorSven Hesse2007-03-02 11:37:42 +0000
committerSven Hesse2007-03-02 11:37:42 +0000
commit65bb902be931a510181c50cc85402cb70359d4e7 (patch)
treef49832a705e772cc9bdecc72ad1f6d1ca4eb439c /engines/gob/game_v2.cpp
parent4efda86d7a50af49914604e6d215e61f1319d95a (diff)
downloadscummvm-rg350-65bb902be931a510181c50cc85402cb70359d4e7.tar.gz
scummvm-rg350-65bb902be931a510181c50cc85402cb70359d4e7.tar.bz2
scummvm-rg350-65bb902be931a510181c50cc85402cb70359d4e7.zip
- Fixed the actor freeze issue in the garage in Bargon Attack
- Some minor fixes svn-id: r25921
Diffstat (limited to 'engines/gob/game_v2.cpp')
-rw-r--r--engines/gob/game_v2.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index 01974a0ce3..11d3743320 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -1038,8 +1038,15 @@ void Game_v2::collisionsBlock(void) {
WRITE_VAR(16, _activeCollResId & 0xFFF);
if (collPtr->funcLeave != 0) {
+ int16 collResIdBak = _activeCollResId;
+ int16 collIndexBak = _activeCollIndex;
+
timeKey = _vm->_util->getTimeKey();
collSub(collPtr->funcLeave);
+
+ _activeCollResId = collResIdBak;
+ _activeCollIndex = collIndexBak;
+
_vm->_inter->animPalette();
deltaTime = timeVal - (_vm->_util->getTimeKey() - timeKey);