[Pingus-CVS] r2626 - in trunk: . src src/actions src/editor src/input/axes src/input/pointers src/input/scrollers src/particles src/worldobjs

[jave27]

Author: jave27
Date: 2006-02-09 16:07:55 +0100 (Thu, 09 Feb 2006)
New Revision: 2626

Modified:
   trunk/Pingus.vcproj
   trunk/src/actions/angel.cxx
   trunk/src/actions/boarder.cxx
   trunk/src/actions/boarder.hxx
   trunk/src/editor/level_head.cxx
   trunk/src/input/axes/joystick_axis.cxx
   trunk/src/input/pointers/axis_pointer.cxx
   trunk/src/input/pointers/mouse_pointer.cxx
   trunk/src/input/scrollers/axis_scroller.cxx
   trunk/src/input/scrollers/mouse_scroller.cxx
   trunk/src/loading.cxx
   trunk/src/particles/pingu_particle_holder.cxx
   trunk/src/particles/rain_particle_holder.cxx
   trunk/src/particles/snow_particle_holder.cxx
   trunk/src/system.cxx
   trunk/src/worldobjs/starfield_background_stars.cxx
Log:
Updated MSVC project and cleaned up some more type conversion warnings.
Fixed a path error for WIN32 systems with home directories residing on places 
other than the C:\.

Modified: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/Pingus.vcproj 2006-02-09 15:07:55 UTC (rev 2626)
@@ -1751,6 +1751,12 @@
                                        
RelativePath=".\src\editor\editor_viewport.hxx">
                                </File>
                                <File
+                                       
RelativePath=".\src\editor\level_head.cxx">
+                               </File>
+                               <File
+                                       
RelativePath=".\src\editor\level_head.hxx">
+                               </File>
+                               <File
                                        
RelativePath=".\src\editor\level_impl.hxx">
                                </File>
                                <File

Modified: trunk/src/actions/angel.cxx
===================================================================
--- trunk/src/actions/angel.cxx 2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/src/actions/angel.cxx 2006-02-09 15:07:55 UTC (rev 2626)
@@ -41,7 +41,7 @@
   sprite.update ();
 
   counter += game_speed;
-  pingu->set_pos(x_pos + 20 * sin (counter * 3.0f), pingu->get_y() - 50.0f * 
0.025f);
+  pingu->set_pos((float)x_pos + 20 * (float)sin (counter * 3.0f), 
pingu->get_y() - 50.0f * 0.025f);
 
   // Out of screen, let the pingu die
   if (pingu->get_y() < -32)

Modified: trunk/src/actions/boarder.cxx
===================================================================
--- trunk/src/actions/boarder.cxx       2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/src/actions/boarder.cxx       2006-02-09 15:07:55 UTC (rev 2626)
@@ -43,38 +43,40 @@
   sprite[pingu->direction].update();
 
   if (on_ground())
+  {
+    if (speed < 15.0)
+      speed += 15.0 * 25.0f/1000.0f;
+    else {
+      speed = 15.0;
+    }
+
+    // Incremental update so that we don't skip pixels
+    Vector new_pos = pingu->get_pos();
+    new_pos.x = new_pos.x + pingu->direction * speed;
+    while (new_pos.x != pingu->get_pos().x)
     {
-      if (speed < 15.0)
-       speed += 15.0 * 25.0f/1000.0f;
-      else {
-       speed = 15.0;
-      }
+      Vector old_pos = pingu->get_pos();
+      pingu->set_pos(Vector(old_pos.x + (old_pos.x < new_pos.x) ? 1.0f : 
-1.0f, 
+        old_pos.y, old_pos.z));
 
-      // Incremental update so that we don't skip pixels
-      double new_x_pos = pingu->get_pos().x + pingu->direction * speed;
-      while (new_x_pos != pingu->get_x())
-       {
-         double old_pos = pingu->get_pos().x;
-         pingu->set_x(old_pos + (pingu->get_x() < new_x_pos) ? 1 : -1);
+      if (pingu->rel_getpixel (1, 0))
+      {
+        // Hit a wall
+        pingu->set_pos(old_pos); // + (pingu->direction * 10);
+        ////pingu->pos.y = 10;
 
-         if (pingu->rel_getpixel (1, 0))
-           {
-             // Hit a wall
-             pingu->set_x(old_pos); // + (pingu->direction * 10);
-             ////pingu->pos.y = 10;
-
-             pingu->apply_force (Vector(speed * pingu->direction * 0.5,
-                                           -speed * abs(pingu->direction) * 
0.5));
-             pingu->set_action(Actions::Walker);
-             return;
-           }
-       }
+        pingu->apply_force (Vector(float(speed * pingu->direction * 0.5),
+          -float(speed * abs(pingu->direction) * 0.5)));
+        pingu->set_action(Actions::Walker);
+        return;
+      }
     }
+  }
   else
-    {
-      pingu->apply_force (Vector(speed * pingu->direction, 0));
-      pingu->set_action(Actions::Walker);
-    }
+  {
+    pingu->apply_force (Vector((float)speed * pingu->direction, 0));
+    pingu->set_action(Actions::Walker);
+  }
 }
 
 void

Modified: trunk/src/actions/boarder.hxx
===================================================================
--- trunk/src/actions/boarder.hxx       2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/src/actions/boarder.hxx       2006-02-09 15:07:55 UTC (rev 2626)
@@ -32,8 +32,8 @@
 {
 private:
   //double counter;
-  double x_pos;
-  double speed;
+  float x_pos;
+  float speed;
   StateSprite sprite;
 public:
   Boarder (Pingu* p);

Modified: trunk/src/editor/level_head.cxx
===================================================================
--- trunk/src/editor/level_head.cxx     2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/src/editor/level_head.cxx     2006-02-09 15:07:55 UTC (rev 2626)
@@ -109,11 +109,11 @@
 LevelHead::draw(DrawingContext& gc)
 {
   // Draw the background for window 
-       gc.draw_fillrect(pos.x, pos.y, CL_Display::get_width() - 50, 
-                   CL_Display::get_height()-50, CL_Color(100,150,50,150));
+  gc.draw_fillrect(pos.x, pos.y, (float)CL_Display::get_width() - 50, 
+                   (float)CL_Display::get_height()-50, 
CL_Color(100,150,50,150));
   // Draw the window border
-  gc.draw_rect(pos.x, pos.y, CL_Display::get_width() - 50,
-               CL_Display::get_height()-50, CL_Color::white);
+  gc.draw_rect(pos.x, pos.y, (float)CL_Display::get_width() - 50,
+               (float)CL_Display::get_height()-50, CL_Color::white);
 }
 
 bool

Modified: trunk/src/input/axes/joystick_axis.cxx
===================================================================
--- trunk/src/input/axes/joystick_axis.cxx      2006-02-05 20:49:22 UTC (rev 
2625)
+++ trunk/src/input/axes/joystick_axis.cxx      2006-02-09 15:07:55 UTC (rev 
2626)
@@ -38,9 +38,9 @@
     PingusError::raise("JoystickAxis: Invalid joystick axis id");
 
   if (angle < 0)
-    angle = (static_cast<int>(angle) % 360) + 360;
+    angle = float(static_cast<int>(angle) % 360) + 360;
   else if (angle > 360)
-    angle = static_cast<int>(angle) % 360;
+    angle = float(static_cast<int>(angle) % 360);
 }
 
 const float&

Modified: trunk/src/input/pointers/axis_pointer.cxx
===================================================================
--- trunk/src/input/pointers/axis_pointer.cxx   2006-02-05 20:49:22 UTC (rev 
2625)
+++ trunk/src/input/pointers/axis_pointer.cxx   2006-02-09 15:07:55 UTC (rev 
2626)
@@ -64,8 +64,8 @@
     {
       (*it)->update(delta);
 
-      x_pos += cos((*it)->get_angle() * 3.14159265 / 180) * speed * delta * 
(*it)->get_pos();
-      y_pos += sin((*it)->get_angle() * 3.14159265 / 180) * speed * delta * 
(*it)->get_pos();
+      x_pos += (float)cos((*it)->get_angle() * 3.14159265 / 180) * speed * 
delta * (*it)->get_pos();
+      y_pos += (float)sin((*it)->get_angle() * 3.14159265 / 180) * speed * 
delta * (*it)->get_pos();
     }
 }
 

Modified: trunk/src/input/pointers/mouse_pointer.cxx
===================================================================
--- trunk/src/input/pointers/mouse_pointer.cxx  2006-02-05 20:49:22 UTC (rev 
2625)
+++ trunk/src/input/pointers/mouse_pointer.cxx  2006-02-09 15:07:55 UTC (rev 
2626)
@@ -59,8 +59,8 @@
 void
 MousePointer::move_signal (const CL_InputEvent& event)
 {
-  x_pos = event.mouse_pos.x;
-  y_pos = event.mouse_pos.y;
+  x_pos = (float)event.mouse_pos.x;
+  y_pos = (float)event.mouse_pos.y;
 }
 
 } // namespace Pointers

Modified: trunk/src/input/scrollers/axis_scroller.cxx
===================================================================
--- trunk/src/input/scrollers/axis_scroller.cxx 2006-02-05 20:49:22 UTC (rev 
2625)
+++ trunk/src/input/scrollers/axis_scroller.cxx 2006-02-09 15:07:55 UTC (rev 
2626)
@@ -72,8 +72,8 @@
     {
       (*it)->update(delta);
 
-      x_delta += cos((*it)->get_angle() * 3.14159265 / 180) * speed * delta * 
(*it)->get_pos();
-      y_delta += sin((*it)->get_angle() * 3.14159265 / 180) * speed * delta * 
(*it)->get_pos();
+      x_delta += (float)cos((*it)->get_angle() * 3.14159265 / 180) * speed * 
delta * (*it)->get_pos();
+      y_delta += (float)sin((*it)->get_angle() * 3.14159265 / 180) * speed * 
delta * (*it)->get_pos();
     }
 
 }

Modified: trunk/src/input/scrollers/mouse_scroller.cxx
===================================================================
--- trunk/src/input/scrollers/mouse_scroller.cxx        2006-02-05 20:49:22 UTC 
(rev 2625)
+++ trunk/src/input/scrollers/mouse_scroller.cxx        2006-02-09 15:07:55 UTC 
(rev 2626)
@@ -58,8 +58,8 @@
   x_delta = device.get_x() - old_x;
   y_delta = device.get_y() - old_y;
 
-  old_x = device.get_x();
-  old_y = device.get_y();
+  old_x = (float)device.get_x();
+  old_y = (float)device.get_y();
 }
 
 } // namespace Scroller

Modified: trunk/src/loading.cxx
===================================================================
--- trunk/src/loading.cxx       2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/src/loading.cxx       2006-02-09 15:07:55 UTC (rev 2626)
@@ -53,8 +53,8 @@
 
   CL_Display::clear();
 
-  sur.draw((CL_Display::get_width() - sur.get_width())/2,
-                (CL_Display::get_height() - sur.get_height())/2);
+  sur.draw(float(CL_Display::get_width() - sur.get_width())/2,
+                float(CL_Display::get_height() - sur.get_height())/2);
 
   Display::flip_display();
 }

Modified: trunk/src/particles/pingu_particle_holder.cxx
===================================================================
--- trunk/src/particles/pingu_particle_holder.cxx       2006-02-05 20:49:22 UTC 
(rev 2625)
+++ trunk/src/particles/pingu_particle_holder.cxx       2006-02-09 15:07:55 UTC 
(rev 2626)
@@ -34,7 +34,7 @@
   : livetime(50 + (rand() % 75)),
     use_frame2((rand() % 5) == 0),
     pos(Vector(x, y)),
-    velocity(Vector(Math::frand() * 7 - 3.5, Math::frand() * -9))
+    velocity(Vector((float)Math::frand() * 7 - 3.5, (float)Math::frand() * -9))
 {
 }
 

Modified: trunk/src/particles/rain_particle_holder.cxx
===================================================================
--- trunk/src/particles/rain_particle_holder.cxx        2006-02-05 20:49:22 UTC 
(rev 2625)
+++ trunk/src/particles/rain_particle_holder.cxx        2006-02-09 15:07:55 UTC 
(rev 2626)
@@ -32,7 +32,7 @@
   : alive(true), splash(false), use_rain2_surf(false), splash_counter(0), 
splash_frame(0), pos(Vector(x, y))
 {
   use_rain2_surf = ((rand() % 3) == 0);
-  pos.z = 1.0 + Math::frand() * 3.0;
+  pos.z = 1.0 + (float)Math::frand() * 3.0;
 }
 
 

Modified: trunk/src/particles/snow_particle_holder.cxx
===================================================================
--- trunk/src/particles/snow_particle_holder.cxx        2006-02-05 20:49:22 UTC 
(rev 2625)
+++ trunk/src/particles/snow_particle_holder.cxx        2006-02-09 15:07:55 UTC 
(rev 2626)
@@ -33,7 +33,7 @@
   : alive(true),
     colliding(colliding_),
     pos(Vector(x,y)),
-    velocity(Vector(0.0f, 1 + (Math::frand() * 3.5f)))
+    velocity(Vector(0.0f, 1 + ((float)Math::frand() * 3.5f)))
 {
   switch (rand() % 10)
     {
@@ -101,7 +101,7 @@
          continue;
        }
 
-      it->velocity.x += (Math::frand() - 0.5f) / 10;
+      it->velocity.x += ((float)Math::frand() - 0.5f) / 10;
 #ifdef CLANLIB_0_6
       if (it->colliding)
         {

Modified: trunk/src/system.cxx
===================================================================
--- trunk/src/system.cxx        2006-02-05 20:49:22 UTC (rev 2625)
+++ trunk/src/system.cxx        2006-02-09 15:07:55 UTC (rev 2626)
@@ -121,7 +121,7 @@
   const char* str = filename.c_str();
   int i;
 
-  for(i = filename.size() - 1; i >= 0; --i)
+  for(i = (int)filename.size() - 1; i >= 0; --i)
     {
       if (*(str + i) == '/') {
        break;
@@ -137,7 +137,7 @@
   const char* str = filename.c_str();
   int i;
 
-  for(i = filename.size() - 1; i >= 0; --i)
+  for(i = (int)filename.size() - 1; i >= 0; --i)
     {
       if (*(str + i) == '/') {
        break;
@@ -152,7 +152,7 @@
 {
   const char* str = filename.c_str ();
   int i;
-  int last_char = filename.size() - 1;
+  int last_char = (int)filename.size() - 1;
 
   for(i = last_char; i >= 0; --i)
     {
@@ -258,9 +258,14 @@
 {
 #ifdef WIN32
        std::string tmpstr;
-       char* homedir = getenv("HOMEPATH");
+       char* homedir = getenv("HOMEDRIVE");
        if (homedir)
-               tmpstr = std::string(homedir) + "/.pingus/";
+  {
+    tmpstr = std::string(homedir);
+    homedir = 0;
+    homedir = getenv("HOMEPATH");
+               tmpstr = tmpstr + std::string(homedir) + "/.pingus/";
+  }
        else
                tmpstr = "user/";
        return tmpstr;

Modified: trunk/src/worldobjs/starfield_background_stars.cxx
===================================================================
--- trunk/src/worldobjs/starfield_background_stars.cxx  2006-02-05 20:49:22 UTC 
(rev 2625)
+++ trunk/src/worldobjs/starfield_background_stars.cxx  2006-02-09 15:07:55 UTC 
(rev 2626)
@@ -40,8 +40,8 @@
       break;
     }
 
-  x_pos = rand() % WorldObj::get_world()->get_width();
-  y_pos = rand() % WorldObj::get_world()->get_height();
+  x_pos = float(rand() % WorldObj::get_world()->get_width());
+  y_pos = float(rand() % WorldObj::get_world()->get_height());
 
   x_add = rand() % 5 + 1.0f;
   y_add = 0.0f;
@@ -56,7 +56,7 @@
   if (x_pos > WorldObj::get_world()->get_width())
     {
       x_pos = -32;
-      y_pos = rand() % WorldObj::get_world()->get_height();
+      y_pos = float(rand() % WorldObj::get_world()->get_height());
     }
 }