aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/scene_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-08-17 18:46:29 +0200
committerJohannes Schickel2011-12-26 16:18:14 +0100
commitf7032c126dd097e8083e0fc740c7c856e0f2dd58 (patch)
tree0d3c6917f6c27d63326ed62954e35e1c3b7df4d2 /engines/kyra/scene_eob.cpp
parentb3c8173bd46ddc831344848723598846bd5c41e8 (diff)
downloadscummvm-rg350-f7032c126dd097e8083e0fc740c7c856e0f2dd58.tar.gz
scummvm-rg350-f7032c126dd097e8083e0fc740c7c856e0f2dd58.tar.bz2
scummvm-rg350-f7032c126dd097e8083e0fc740c7c856e0f2dd58.zip
KYRA: (EOB) - fix some bugs
- fix monster movement - fix character level gain - add some static res for party transfer
Diffstat (limited to 'engines/kyra/scene_eob.cpp')
-rw-r--r--engines/kyra/scene_eob.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index afce9efdfa..1bd7fca04a 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1012,8 +1012,8 @@ void EobCoreEngine::drawScene(int refresh) {
}
if (_sceneDefaultUpdate) {
- resetSkipFlag();
delayUntil(_drawSceneTimer);
+ removeInputTop();
}
if (refresh && !_partyResting)
@@ -1029,7 +1029,7 @@ void EobCoreEngine::drawScene(int refresh) {
if (_sceneDefaultUpdate) {
_sceneDefaultUpdate = false;
- _drawSceneTimer = _system->getMillis() /*+ 4 * _tickLength*/;
+ _drawSceneTimer = _system->getMillis() + 4 * _tickLength;
}
_sceneUpdateRequired = false;
@@ -1141,8 +1141,8 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
int w = _levelBlockProperties[b].walls[direction ^ 2];
int f = _wllWallFlags[w];
- if (!f)
- assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
+ //if (!f)
+ assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
if (_flags.gameID == GI_EOB2 && w == 74 && _currentBlock == curBlock) {
for (int i = 0; i < 5; i++) {