[Scummvm-cvs-logs] scummvm master -> 7c753d3a13738e715f7001bbf965f772e64694e4

[dreammaster]

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:
7c753d3a13 TSAGE: Cleanup and correct entrance/exits for R2R balloon launch


Commit: 7c753d3a13738e715f7001bbf965f772e64694e4
    https://github.com/scummvm/scummvm/commit/7c753d3a13738e715f7001bbf965f772e64694e4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-16T15:42:38-08:00

Commit Message:
TSAGE: Cleanup and correct entrance/exits for R2R balloon launch

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes2.cpp
    engines/tsage/ringworld2/ringworld2_scenes2.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index f23a345..f928f36 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1061,8 +1061,9 @@ bool Scene2350::Balloon::startAction(CursorType action, Event &event) {
 
 void Scene2350::ExitUp::changeScene() {
 	Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
+	_enabled = false;
 
-	R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS);
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
 	scene->_sceneMode = 12;
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 		scene->setAction(&scene->_sequenceManager, scene, 2350, &R2_GLOBALS._player, NULL);
@@ -1139,7 +1140,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.disableControl();
 
 	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
-		if (R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] == 34) {
+		if (R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] != 34) {
 			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 				_sceneMode = 2351;
 			else
@@ -1201,17 +1202,6 @@ void Scene2350::signal() {
 	}
 }
 
-void Scene2350::process(Event &event) {
-	if ((R2_GLOBALS._player._canWalk) && (event.eventType != EVENT_BUTTON_DOWN) &&
-			(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)){
-		Common::Point pt(event.mousePos.x, 129);
-		PlayerMover *mover = new PlayerMover();
-		R2_GLOBALS._player.addMover(mover, &pt);
-		event.handled = true;
-	}
-	Scene::process(event);
-}
-
 /*--------------------------------------------------------------------------
  * Scene 2400 - Spill Mountains: Large empty room
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index d474297..3960d93 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -120,7 +120,6 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
 	virtual void signal();
-	virtual void process(Event &event);
 };
 
 class Scene2400 : public SceneExt {