From 47f43770ae05477d2ea41858d48248391006ce59 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 9 Nov 2015 09:22:27 +0100
Subject: MADS: Phantom: Only force a reset of scaling velocity when the
 section changes

---
 engines/mads/phantom/phantom_scenes.cpp | 3 +++
 engines/mads/phantom/phantom_scenes1.h  | 2 +-
 engines/mads/phantom/phantom_scenes2.h  | 2 +-
 engines/mads/phantom/phantom_scenes3.h  | 2 +-
 engines/mads/phantom/phantom_scenes4.h  | 2 +-
 engines/mads/phantom/phantom_scenes5.h  | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/mads/phantom/phantom_scenes.cpp b/engines/mads/phantom/phantom_scenes.cpp
index 660eb40307..344601f53d 100644
--- a/engines/mads/phantom/phantom_scenes.cpp
+++ b/engines/mads/phantom/phantom_scenes.cpp
@@ -41,6 +41,9 @@ namespace Phantom {
 SceneLogic *SceneFactory::createScene(MADSEngine *vm) {
 	Scene &scene = vm->_game->_scene;
 
+	if ((scene._nextSceneId / 100) != (scene._priorSceneId / 100))
+		vm->_game->_player._scalingVelocity = true;
+
 	switch (scene._nextSceneId) {
 	// Scene group #1 (theater, stage and dressing rooms)
 	case 101:	// seats
diff --git a/engines/mads/phantom/phantom_scenes1.h b/engines/mads/phantom/phantom_scenes1.h
index dbf7d6d29f..d1be6e027e 100644
--- a/engines/mads/phantom/phantom_scenes1.h
+++ b/engines/mads/phantom/phantom_scenes1.h
@@ -50,7 +50,7 @@ protected:
 	 */
 	void setPlayerSpritesPrefix();
 public:
-	Scene1xx(MADSEngine *vm) : PhantomScene(vm) { _game._player._scalingVelocity = true; }
+	Scene1xx(MADSEngine *vm) : PhantomScene(vm) {}
 };
 
 class Scene101 : public Scene1xx {
diff --git a/engines/mads/phantom/phantom_scenes2.h b/engines/mads/phantom/phantom_scenes2.h
index 14a2848f42..7e86e2ce0f 100644
--- a/engines/mads/phantom/phantom_scenes2.h
+++ b/engines/mads/phantom/phantom_scenes2.h
@@ -50,7 +50,7 @@ protected:
 	 */
 	void setPlayerSpritesPrefix();
 public:
-	Scene2xx(MADSEngine *vm) : PhantomScene(vm) { _game._player._scalingVelocity = true; }
+	Scene2xx(MADSEngine *vm) : PhantomScene(vm) {}
 };
 
 class Scene201 : public Scene2xx {
diff --git a/engines/mads/phantom/phantom_scenes3.h b/engines/mads/phantom/phantom_scenes3.h
index bea020396f..48ca998054 100644
--- a/engines/mads/phantom/phantom_scenes3.h
+++ b/engines/mads/phantom/phantom_scenes3.h
@@ -50,7 +50,7 @@ protected:
 	 */
 	void setPlayerSpritesPrefix();
 public:
-	Scene3xx(MADSEngine *vm) : PhantomScene(vm) { _game._player._scalingVelocity = true; }
+	Scene3xx(MADSEngine *vm) : PhantomScene(vm) {}
 };
 
 class Scene301 : public Scene3xx {
diff --git a/engines/mads/phantom/phantom_scenes4.h b/engines/mads/phantom/phantom_scenes4.h
index ed35d7733b..eb3c1bd98f 100644
--- a/engines/mads/phantom/phantom_scenes4.h
+++ b/engines/mads/phantom/phantom_scenes4.h
@@ -50,7 +50,7 @@ protected:
 	 */
 	void setPlayerSpritesPrefix();
 public:
-	Scene4xx(MADSEngine *vm) : PhantomScene(vm) { _game._player._scalingVelocity = true; }
+	Scene4xx(MADSEngine *vm) : PhantomScene(vm) {}
 };
 
 class Scene401 : public Scene4xx {
diff --git a/engines/mads/phantom/phantom_scenes5.h b/engines/mads/phantom/phantom_scenes5.h
index 903819a107..dc8a870ed3 100644
--- a/engines/mads/phantom/phantom_scenes5.h
+++ b/engines/mads/phantom/phantom_scenes5.h
@@ -50,7 +50,7 @@ protected:
 	 */
 	void setPlayerSpritesPrefix();
 public:
-	Scene5xx(MADSEngine *vm) : PhantomScene(vm) { _game._player._scalingVelocity = true; }
+	Scene5xx(MADSEngine *vm) : PhantomScene(vm) {}
 };
 
 class Scene501 : public Scene5xx {
-- 
cgit v1.2.3