[Scummvm-cvs-logs] scummvm master -> a8dfcd61944e1dd079387db3f7b9e9691a3feb49

Strangerke arnaud.boutonne at gmail.com
Sat Apr 23 01:22:44 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:
a8dfcd6194 TSAGE: Fix Miranda in scene 4000, 4040 and 4045


Commit: a8dfcd61944e1dd079387db3f7b9e9691a3feb49
    https://github.com/scummvm/scummvm/commit/a8dfcd61944e1dd079387db3f7b9e9691a3feb49
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-22T16:21:56-07:00

Commit Message:
TSAGE: Fix Miranda in scene 4000, 4040 and 4045

Changed paths:
    engines/tsage/ringworld_scenes3.cpp
    engines/tsage/ringworld_scenes5.cpp



diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index bd276a8..6205571 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -5345,7 +5345,7 @@ void Scene2320::Action5::signal() {
 			NpcMover *mover = new NpcMover();
 			scene->_hotspot11.addMover(mover, &pt, NULL);
 
-			_globals->clearFlag(53);
+			_globals->clearFlag(43);
 			scene->_stripManager.start(2325, this);
 		}
 		break;
diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp
index 2655fd3..cfed7b1 100644
--- a/engines/tsage/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld_scenes5.cpp
@@ -860,7 +860,6 @@ void Scene4000::postInit(SceneObjectList *OwnerList) {
 	_globals->_player.setObjectWrapper(new SceneObjectWrapper());
 	_globals->_player.setPosition(Common::Point(-28, 86));
 
-	warning("flag 36 & 43: %d %d", _globals->getFlag(36), _globals->getFlag(43));
 	if (!_globals->getFlag(36) && !_globals->getFlag(43)) {
 		_miranda.postInit();
 		_miranda.setVisage(2701);






More information about the Scummvm-git-logs mailing list