[Scummvm-cvs-logs] scummvm master -> 9b52ce590f011fc5d3606f38eb7a8f07c39d4b59

Strangerke Strangerke at scummvm.org
Tue Nov 24 17:43:13 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9b52ce590f MADS: Phantom: Fix asserts in moveCatacombs


Commit: 9b52ce590f011fc5d3606f38eb7a8f07c39d4b59
    https://github.com/scummvm/scummvm/commit/9b52ce590f011fc5d3606f38eb7a8f07c39d4b59
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-24T17:37:37+01:00

Commit Message:
MADS: Phantom: Fix asserts in moveCatacombs

Changed paths:
    engines/mads/phantom/game_phantom.cpp



diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp
index 597d404..b806c1e 100644
--- a/engines/mads/phantom/game_phantom.cpp
+++ b/engines/mads/phantom/game_phantom.cpp
@@ -891,8 +891,8 @@ int GamePhantom::exitCatacombs(int dir) {
 }
 
 void GamePhantom::moveCatacombs(int dir) {
-	assert(_globals[kCatacombsRoom] = CLIP(_globals[kCatacombsRoom], 0, _catacombSize));
-	assert(dir = CLIP(dir, 0, 3));
+	assert(_globals[kCatacombsRoom] == CLIP(_globals[kCatacombsRoom], 0, _catacombSize));
+	assert(dir == CLIP(dir, 0, 3));
 
 	newCatacombRoom(_catacombs[_globals[kCatacombsRoom]]._fromDirection[dir], _catacombs[_globals[kCatacombsRoom]]._exit[dir]);
 }






More information about the Scummvm-git-logs mailing list