[Adonthell-devel] [PATCH] Fixed float/int warnings when compiling in strict mode, in moving.cc

[Chris Frey]

---

Just another strict compiler warning patch.  This was for the DEBUG_COLLISION
code that I missed before.

- Chris


 src/world/moving.cc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/world/moving.cc b/src/world/moving.cc
index 1219b1c..9a44e5e 100644
--- a/src/world/moving.cc
+++ b/src/world/moving.cc
@@ -268,13 +268,13 @@ void moving::update_position ()
     pos_y -= placeable::height()/2;
     
     // draw velocity along x,y axis
-    Image->draw_line (pos_x, pos_y, pos_x + Velocity.x()*20, pos_y + 
Velocity.y() * 20, Image->map_color (0, 0, 255), &da);
+    Image->draw_line (pos_x, pos_y, (u_int16) (pos_x + Velocity.x()*20), 
(u_int16) (pos_y + Velocity.y() * 20), Image->map_color (0, 0, 255), &da);
 
     // draw gravity
-    Image->draw_line (pos_x, pos_y, pos_x, pos_y - gravity * 20, 
Image->map_color (255, 0, 0), &da);        
+    Image->draw_line (pos_x, pos_y, pos_x, (u_int16) (pos_y - gravity * 20), 
Image->map_color (255, 0, 0), &da);        
 
     // draw velocity along z axis
-    Image->draw_line (pos_x, pos_y, pos_x, pos_y - Velocity.z() * 20, 
Image->map_color (0, 0, 255), &da);        
+    Image->draw_line (pos_x, pos_y, pos_x, (u_int16) (pos_y - Velocity.z() * 
20), Image->map_color (0, 0, 255), &da);        
 
     // did we collide at all?
     const triangle3<float> *tri = collisionData.triangle ();
@@ -301,10 +301,10 @@ void moving::update_position ()
     if (tri != NULL)
     {
         // draw actual movement along x,y axis
-        Image->draw_line (pos_x, pos_y, pos_x + (x - Position.x()) * 20, pos_y 
+ (y - Position.y()) * 20, Image->map_color (0, 255, 0), &da);
+        Image->draw_line (pos_x, pos_y, (u_int16) (pos_x + (x - Position.x()) 
* 20), (u_int16) (pos_y + (y - Position.y()) * 20), Image->map_color (0, 255, 
0), &da);
     
         // draw actual movement along z axis
-        Image->draw_line (pos_x, pos_y, pos_x, pos_y - (z - Z) * 20, 
Image->map_color (0, 255, 0), &da);
+        Image->draw_line (pos_x, pos_y, pos_x, (u_int16) (pos_y - (z - Z) * 
20), Image->map_color (0, 255, 0), &da);
     }
 #endif
 
-- 
1.6.0.2