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

[Strangerke]

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:
e149f5bedc TSAGE: Fix a crash and a freeze in scene 4250.


Commit: e149f5bedc491e632dae2afe805901937883826d
    https://github.com/scummvm/scummvm/commit/e149f5bedc491e632dae2afe805901937883826d
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-02T15:27:10-07:00

Commit Message:
TSAGE: Fix a crash and a freeze in scene 4250.

Changed paths:
    engines/tsage/ringworld_scenes5.cpp



diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp
index e61c7d5..b840407 100644
--- a/engines/tsage/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld_scenes5.cpp
@@ -3554,7 +3554,6 @@ void Scene4250::postInit(tSage::SceneObjectList *OwnerList) {
 		_hotspot1.setPosition(Common::Point(197, 173));
 		_hotspot1.changeZoom(70);
 
-		_globals->_player.setObjectWrapper(new SceneObjectWrapper());
 		_globals->_player.setPosition(Common::Point(252, 176));
 		_globals->_player.changeZoom(70);
 
@@ -3586,7 +3585,7 @@ void Scene4250::postInit(tSage::SceneObjectList *OwnerList) {
 				_sceneMode = 4253;
 				_globals->_sceneItems.push_front(&_hotspot6);
 
-				setAction(&_sequenceManager, this, 4253, &_globals->_player, NULL);
+				setAction(&_sequenceManager, this, 4253, &_globals->_player, &_hotspot6, &_hotspot4, NULL);
 			}
 		}
 	} else if (_globals->_stripNum == 9000) {