commited Matzes Win32 patch

[supertux.git] / src / gameloop.cpp

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 58f9593..2654291 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -19,7 +19,6 @@
 #include <SDL.h>
 
 #ifndef WIN32
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
 #endif
@@ -232,7 +231,6 @@ void game_event(void)
               break;
             }
           break;
-#ifdef JOY_YES
 
         case SDL_JOYAXISMOTION:
           switch(event.jaxis.axis)
@@ -283,7 +281,6 @@ void game_event(void)
             menuaction = MN_HIT;
           break;
 
-#endif
         default:
           break;
 
@@ -297,7 +294,7 @@ void game_event(void)
 
 int game_action(void)
 {
-  int i;
+  unsigned int i;
 
   /* (tux_dying || next_level) */
   if (tux.dying || next_level)
@@ -387,7 +384,7 @@ int game_action(void)
 
   /* Handle bouncy distros: */
 
-  for (i = 0; i < num_bouncy_distros; i++)
+  for (i = 0; i < bouncy_distros.size(); i++)
     {
       bouncy_distro_action(&bouncy_distros[i]);
     }
@@ -395,7 +392,7 @@ int game_action(void)
 
   /* Handle broken bricks: */
 
-  for (i = 0; i < num_broken_bricks; i++)
+  for (i = 0; i < broken_bricks.size(); i++)
     {
       broken_brick_action(&broken_bricks[i]);
     }
@@ -414,7 +411,7 @@ int game_action(void)
 
   /* Handle bouncy bricks: */
 
-  for (i = 0; i < num_bouncy_bricks; i++)
+  for (i = 0; i < bouncy_bricks.size(); i++)
     {
       bouncy_brick_action(&bouncy_bricks[i]);
     }
@@ -422,7 +419,7 @@ int game_action(void)
 
   /* Handle floating scores: */
 
-  for (i = 0; i < num_floating_scores; i++)
+  for (i = 0; i < floating_scores.size(); i++)
     {
       floating_score_action(&floating_scores[i]);
     }
@@ -430,14 +427,14 @@ int game_action(void)
 
   /* Handle bullets: */
 
-  for (i = 0; i < num_bullets; ++i)
+  for (i = 0; i < bullets.size(); ++i)
     {
       bullet_action(&bullets[i]);
     }
 
   /* Handle upgrades: */
 
-  for (i = 0; i < num_upgrades; i++)
+  for (i = 0; i < upgrades.size(); i++)
     {
       upgrade_action(&upgrades[i]);
     }
@@ -445,7 +442,7 @@ int game_action(void)
 
   /* Handle bad guys: */
 
-  for (i = 0; i < num_bad_guys; i++)
+  for (i = 0; i < bad_guys.size(); i++)
     {
       badguy_action(&bad_guys[i]);
     }
@@ -460,7 +457,8 @@ int game_action(void)
 
 void game_draw(void)
 {
-  int  x, y, i, s;
+  int y, s;
+  unsigned int i,x;
 
   /* Draw screen: */
 
@@ -497,7 +495,7 @@ void game_draw(void)
 
   /* (Bouncy bricks): */
 
-  for (i = 0; i < num_bouncy_bricks; ++i)
+  for (i = 0; i < bouncy_bricks.size(); ++i)
     {
       bouncy_brick_draw(&bouncy_bricks[i]);
     }
@@ -505,7 +503,7 @@ void game_draw(void)
 
   /* (Bad guys): */
 
-  for (i = 0; i < num_bad_guys; ++i)
+  for (i = 0; i < bad_guys.size(); ++i)
     {
       badguy_draw(&bad_guys[i]);
     }
@@ -516,14 +514,14 @@ void game_draw(void)
 
   /* (Bullets): */
 
-  for (i = 0; i < num_bullets; ++i)
+  for (i = 0; i < bullets.size(); ++i)
     {
       bullet_draw(&bullets[i]);
     }
 
   /* (Floating scores): */
 
-  for (i = 0; i < num_floating_scores; ++i)
+  for (i = 0; i < floating_scores.size(); ++i)
     {
       floating_score_draw(&floating_scores[i]);
     }
@@ -531,7 +529,7 @@ void game_draw(void)
 
   /* (Upgrades): */
 
-  for (i = 0; i < num_upgrades; ++i)
+  for (i = 0; i < upgrades.size(); ++i)
     {
       upgrade_draw(&upgrades[i]);
     }
@@ -539,7 +537,7 @@ void game_draw(void)
 
   /* (Bouncy distros): */
 
-  for (i = 0; i < num_bouncy_distros; ++i)
+  for (i = 0; i < bouncy_distros.size(); ++i)
     {
       bouncy_distro_draw(&bouncy_distros[i]);
     }
@@ -547,7 +545,7 @@ void game_draw(void)
 
   /* (Broken bricks): */
 
-  for (i = 0; i < num_broken_bricks; ++i)
+  for (i = 0; i < broken_bricks.size(); ++i)
     {
       broken_brick_draw(&broken_bricks[i]);
     }
@@ -1190,7 +1188,7 @@ void loadshared(void)
      Send a mail to me: neoneurone@users.sf.net, if you have another opinion. :)
   */
   for (i = 0; i < NUM_SOUNDS; i++)
-    sounds[i] = load_sound(soundfilenames[i]);
+    sounds[i] = load_sound(datadir + soundfilenames[i]);
 
   /* Herring song */
   herring_song = load_song(datadir + "/music/SALCON.MOD");
@@ -1568,15 +1566,14 @@ void trygrabdistro(float x, float y, int bounciness)
 
 void trybumpbadguy(float x, float y)
 {
-  int i;
+  unsigned int i;
 
 
   /* Bad guys: */
 
-  for (i = 0; i < num_bad_guys; i++)
+  for (i = 0; i < bad_guys.size(); i++)
     {
-      if (bad_guys[i].base.alive &&
-          bad_guys[i].base.x >= x - 32 && bad_guys[i].base.x <= x + 32 &&
+      if (bad_guys[i].base.x >= x - 32 && bad_guys[i].base.x <= x + 32 &&
           bad_guys[i].base.y >= y - 16 && bad_guys[i].base.y <= y + 16)
         {
           if (bad_guys[i].kind == BAD_BSOD ||
@@ -1592,9 +1589,9 @@ void trybumpbadguy(float x, float y)
 
   /* Upgrades: */
 
-  for (i = 0; i < num_upgrades; i++)
+  for (i = 0; i < upgrades.size(); i++)
     {
-      if (upgrades[i].base.alive && upgrades[i].base.height == 32 &&
+      if (upgrades[i].base.height == 32 &&
           upgrades[i].base.x >= x - 32 && upgrades[i].base.x <= x + 32 &&
           upgrades[i].base.y >= y - 16 && upgrades[i].base.y <= y + 16)
         {