libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-14 16:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MADS: Phantom: Add more checks in exitCatacombs

Browse Source 
Fix an assert in moveCatacombs
This commit is contained in:
Strangerke 2015-11-24 17:44:21 +01:00
parent 9b52ce590f
commit 351ce463ca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/mads/phantom/game_phantom.cpp
View File

@ -885,13 +885,14 @@ void GamePhantom::setupCatacombs() {
}
int GamePhantom::exitCatacombs(int dir) {
int scene = _globals[kCatacombsRoom];
assert ((scene < _catacombSize) && (dir < 4));
return (_catacombs[scene]._exit[dir]);
assert(_globals[kCatacombsRoom] == CLIP(_globals[kCatacombsRoom], 0, _catacombSize - 1));
assert(dir == CLIP(dir, 0, 3));
return (_catacombs[_globals[kCatacombsRoom]]._exit[dir]);
}
void GamePhantom::moveCatacombs(int dir) {
assert(_globals[kCatacombsRoom] == CLIP(_globals[kCatacombsRoom], 0, _catacombSize));
assert(_globals[kCatacombsRoom] == CLIP(_globals[kCatacombsRoom], 0, _catacombSize - 1));
assert(dir == CLIP(dir, 0, 3));
newCatacombRoom(_catacombs[_globals[kCatacombsRoom]]._fromDirection[dir], _catacombs[_globals[kCatacombsRoom]]._exit[dir]);