[Pingus-CVS] CVS: Games/Pingus/src/input/axes button_axis.cxx,1.2,1.3 inverted_axis.cxx,1.1,1.2

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/input/axes
In directory dark:/tmp/cvs-serv13100/src/input/axes

Modified Files:
        button_axis.cxx inverted_axis.cxx 
Log Message:
- applied the outstanding patches from the ML
- optimized force_vector a little 


Index: button_axis.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/button_axis.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- button_axis.cxx     26 Aug 2002 13:53:04 -0000      1.2
+++ button_axis.cxx     14 Oct 2002 11:15:15 -0000      1.3
@@ -28,9 +28,9 @@
                             pos(0), angle(angle_), button1(button1_), 
button2(button2_) 
     {
       if (angle < 0)
-        angle = (static_cast<int>(angle) % 360) + 360;
+        angle = static_cast<float>((static_cast<int>(angle) % 360) + 360);
       else if (angle > 360)
-        angle = static_cast<int>(angle) % 360;
+        angle = static_cast<float>((static_cast<int>(angle) % 360) + 0);
     }
 
     ButtonAxis::~ButtonAxis ()

Index: inverted_axis.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/inverted_axis.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inverted_axis.cxx   24 Aug 2002 11:37:31 -0000      1.1
+++ inverted_axis.cxx   14 Oct 2002 11:15:15 -0000      1.2
@@ -25,7 +25,7 @@
 
     InvertedAxis::InvertedAxis (Axis* axis_) : axis(axis_)
     {
-      angle = (static_cast<int>(axis->get_angle()) + 180) % 360;
+      angle = static_cast<float>((static_cast<int>(axis->get_angle()) + 180) % 
360);
     }
 
     InvertedAxis::~InvertedAxis ()