[Scummvm-cvs-logs] scummvm master -> 5e4b20b3d718182990f742c05e5f84899f520664

dreammaster dreammaster at scummvm.org
Wed May 11 13:53:46 CEST 2011


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:
5e4b20b3d7 TSAGE: Bugfix for Flesh-eaters moving too fast in Scene #5100


Commit: 5e4b20b3d718182990f742c05e5f84899f520664
    https://github.com/scummvm/scummvm/commit/5e4b20b3d718182990f742c05e5f84899f520664
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-11T04:32:52-07:00

Commit Message:
TSAGE: Bugfix for Flesh-eaters moving too fast in Scene #5100

Changed paths:
    engines/tsage/ringworld_scenes6.cpp



diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index 585a599..dda2864 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1391,8 +1391,7 @@ void Scene5100::dispatch() {
 
 	if (_globals->getFlag(61) && !_globals->getFlag(62) &&
 			((_globals->_player._position.x - _hotspot2._position.x) < 160) &&
-			(_globals->_sceneManager._previousScene != 5200) &&
-			(_globals->_sceneManager._previousScene != 5150)) {
+			(_globals->_sceneManager._previousScene != 5200) && (_sceneMode != 5150)) {
 		setAction(NULL);
 		_sceneMode = 5150;
 		_soundHandler.startSound(208);






More information about the Scummvm-git-logs mailing list