diff options
| author | athrxx | 2011-08-14 18:29:45 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:14 +0100 |
| commit | 0d54aff6324b1f6c739df89ab072328cc5402873 (patch) | |
| tree | ec5b68728d65450e044a0eeabb961d83a1841f5a /engines/kyra/scene_eob.cpp | |
| parent | 359f3efd03704965d258c90381412a5ef2cf9239 (diff) | |
| download | scummvm-rg350-0d54aff6324b1f6c739df89ab072328cc5402873.tar.gz scummvm-rg350-0d54aff6324b1f6c739df89ab072328cc5402873.tar.bz2 scummvm-rg350-0d54aff6324b1f6c739df89ab072328cc5402873.zip | |
KYRA: (EOB) - add EOB 1 intro
(also add and fix several other things, like cone of cold vortex, drawShape issues, etc.)
Diffstat (limited to 'engines/kyra/scene_eob.cpp')
| -rw-r--r-- | engines/kyra/scene_eob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp index 4c1bb1636f..aef131f6cb 100644 --- a/engines/kyra/scene_eob.cpp +++ b/engines/kyra/scene_eob.cpp @@ -1139,10 +1139,10 @@ void EobCoreEngine::drawDecorations(int index) { int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) { uint16 b = calcNewBlockPosition(curBlock, direction); int w = _levelBlockProperties[b].walls[direction ^ 2]; - int f = _wllWallFlags[w]; + if (!f) - assert (w < (_flags.gameID == GI_EOB1 ? 70 : 80)); + assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80)); if (w == 74 && _currentBlock == curBlock) { for (int i = 0; i < 5; i++) { |