From c06d301ebcc6a619a8a104355c25ad855e4b7478 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 14 Dec 2013 21:27:54 +0100
Subject: TSAGE: R2R - Fix optimizer behavior reported by Digitall in scene
 3500

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 12 ++++++------
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 732add03ec..a9a4d55e5c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3500,11 +3500,11 @@ bool Scene3500::Throttle::startAction(CursorType action, Event &event) {
 
 /*--------------------------------------------------------------------------*/
 
-int Scene3500::MazeUI3500::cellFromX(int x) {
+int16 Scene3500::MazeUI3500::cellFromX(int x) {
 	return (_cellSize.x / 2) + x - (x % _cellSize.x);
 }
 
-int Scene3500::MazeUI3500::cellFromY(int y) {
+int16 Scene3500::MazeUI3500::cellFromY(int y) {
 	return (_cellSize.y / 2) + y - (y % _cellSize.y) - 1;
 }
 
@@ -3888,10 +3888,10 @@ void Scene3500::dispatch() {
 	if (!_rotation)
 		return;
 
-	int newMazeX = 0;
-	int newMazeY = 0;
-	int mazePosX = 0;
-	int mazePosY = 0;
+	int16 newMazeX = 0;
+	int16 newMazeY = 0;
+	int16 mazePosX = 0;
+	int16 mazePosY = 0;
 	int deltaX = 0;
 	int deltaY = 0;
 	int tmpCellId = 0;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 398d09a01e..7618cc286f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -619,8 +619,8 @@ class Scene3500 : public SceneExt {
 
 	class MazeUI3500 : public MazeUI {
 	public:
-		int cellFromX(int arg1);
-		int cellFromY(int arg1);
+		int16 cellFromX(int arg1);
+		int16 cellFromY(int arg1);
 		int getCellFromMapXY(Common::Point pt);
 		bool setMazePosition2(Common::Point &p);
 	};
-- 
cgit v1.2.3