[Super-tux-commit] supertux/src defines.h,1.33,1.34 world.cpp,1.70,1.71 world.h,1.38,1.39

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20063/src

Modified Files:
	defines.h world.cpp world.h 
Log Message:
Well, Ingo and Tobias prefer the old shooting behavior, so here it goes.

Index: world.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- world.h	9 May 2004 21:15:58 -0000	1.38
+++ world.h	10 May 2004 13:21:41 -0000	1.39
@@ -58,7 +58,6 @@
   std::vector<FloatingScore*> floating_scores;
 
   std::vector<Upgrade> upgrades;
-  Timer bullets_timer;
   std::vector<Bullet> bullets;
   typedef std::vector<ParticleSystem*> ParticleSystems;
   ParticleSystems particle_systems;

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- defines.h	9 May 2004 21:15:58 -0000	1.33
+++ defines.h	10 May 2004 13:21:41 -0000	1.34
@@ -69,7 +69,7 @@
 
 #define START_LIVES 4
 
-#define BULLETS_TIMEOUT 500
+#define BULLETS_MAX 2
 
 #define YM_FOR_JUMP 6.0
 #define WALK_ACCELERATION_X 0.03

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- world.cpp	9 May 2004 21:15:58 -0000	1.70
+++ world.cpp	10 May 2004 13:21:41 -0000	1.71
@@ -56,7 +56,6 @@
   apply_bonuses();
 
   scrolling_timer.init(true);
-  bullets_timer.init(true);
 }
 
 World::World(const std::string& subset, int level_nr)
@@ -78,7 +77,6 @@
   apply_bonuses();
 
   scrolling_timer.init(true);
-  bullets_timer.init(true);
 }
 
 void
@@ -543,11 +541,9 @@
 void 
 World::add_bullet(float x, float y, float xm, Direction dir)
 {
-  if(bullets_timer.check())
+  if(bullets.size() > MAX_BULLETS-1)
     return;
 
-  bullets_timer.start(BULLETS_TIMEOUT);
-
   Bullet new_bullet;
   new_bullet.init(x,y,xm,dir);
   bullets.push_back(new_bullet);