From d5b5d4b5454d52de32f9e1fecf6e3fa47aa798c0 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 1 Jun 2014 17:28:11 -0400
Subject: BBVS: Silence gcc conversion warnings

---
 engines/bbvs/minigames/bbtennis.cpp | 8 ++++----
 engines/bbvs/walk.cpp               | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/bbvs/minigames/bbtennis.cpp b/engines/bbvs/minigames/bbtennis.cpp
index 926642cc5f..6f680d0f95 100644
--- a/engines/bbvs/minigames/bbtennis.cpp
+++ b/engines/bbvs/minigames/bbtennis.cpp
@@ -594,9 +594,9 @@ void MinigameBbTennis::updateTennisBall(int objIndex) {
 	}
 
 	obj->fltX = obj->fltX - obj->fltStepX;
-	obj->x = obj->fltX;
+	obj->x = (int)obj->fltX;
 	obj->fltY = obj->fltY - obj->fltStepY;
-	obj->y = obj->fltY;
+	obj->y = (int)obj->fltY;
 
 }
 
@@ -1100,9 +1100,9 @@ void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
 	}
 
 	obj->fltX = obj->fltX - obj->fltStepX;
-	obj->x = obj->fltX;
+	obj->x = (int)obj->fltX;
 	obj->fltY = obj->fltY - obj->fltStepY;
-	obj->y = obj->fltY;
+	obj->y = (int)obj->fltY;
 	
 }
 
diff --git a/engines/bbvs/walk.cpp b/engines/bbvs/walk.cpp
index cf8942e525..4d71d95fc0 100644
--- a/engines/bbvs/walk.cpp
+++ b/engines/bbvs/walk.cpp
@@ -112,9 +112,9 @@ void BbvsEngine::walkObject(SceneObject *sceneObject, const Common::Point &destP
 	float distance = sqrt((double)(deltaX * deltaX + deltaY * deltaY));
 	// NOTE The original doesn't have this check but without it the whole pathfinding breaks
 	if (distance > 0.0) {
-		sceneObject->walkCount = distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120));
-		sceneObject->xIncr = ((float)deltaX / sceneObject->walkCount) * 65536.0;
-		sceneObject->yIncr = ((float)deltaY / sceneObject->walkCount) * 65536.0;
+		sceneObject->walkCount = (int)(distance / ((((float)ABS(deltaX) / distance) + 1.0) * ((float)walkSpeed / 120)));
+		sceneObject->xIncr = (int)(((float)deltaX / sceneObject->walkCount) * 65536.0);
+		sceneObject->yIncr = (int)(((float)deltaY / sceneObject->walkCount) * 65536.0);
 		sceneObject->x = (sceneObject->x & 0xFFFF0000) | 0x8000;
 		sceneObject->y = (sceneObject->y & 0xFFFF0000) | 0x8000;
 	} else
-- 
cgit v1.2.3