[Scummvm-cvs-logs] scummvm master -> 0e6c4de8c644784c7404efb759a3274ccadcb20d

Strangerke Strangerke at scummvm.org
Sun Feb 9 00:38:14 CET 2014


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:
0e6c4de8c6 TSAGE: Ringworld - Remove a redundant check on the previous scene number in scene 9500


Commit: 0e6c4de8c644784c7404efb759a3274ccadcb20d
    https://github.com/scummvm/scummvm/commit/0e6c4de8c644784c7404efb759a3274ccadcb20d
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-08T15:36:50-08:00

Commit Message:
TSAGE: Ringworld - Remove a redundant check on the previous scene number in scene 9500

Changed paths:
    engines/tsage/ringworld/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld/ringworld_scenes10.cpp b/engines/tsage/ringworld/ringworld_scenes10.cpp
index eac181e..116dca1 100644
--- a/engines/tsage/ringworld/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes10.cpp
@@ -1217,7 +1217,7 @@ void Scene9500::postInit(SceneObjectList *OwnerList) {
 	g_globals->_events.setCursor(CURSOR_WALK);
 	g_globals->_player.disableControl();
 
-	if ((g_globals->_sceneManager._previousScene == 9200) || (g_globals->_sceneManager._previousScene != 9850)) {
+	if (g_globals->_sceneManager._previousScene != 9850) {
 		_sceneMode = 0;
 		if (RING_INVENTORY._helmet._sceneNumber != 1) {
 			setAction(&_sequenceManager, this, 9501, &g_globals->_player, &_candle, NULL);






More information about the Scummvm-git-logs mailing list