Well, Ingo and Tobias prefer the old shooting behavior, so here it goes.

SVN-Revision: 1065

diff --git a/src/defines.h b/src/defines.h
index 49c81ce..c23ed24 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -69,7 +69,7 @@ enum DyingType {
 
 #define START_LIVES 4
 
-#define BULLETS_TIMEOUT 500
+#define BULLETS_MAX 2
 
 #define YM_FOR_JUMP 6.0
 #define WALK_ACCELERATION_X 0.03

diff --git a/src/world.cpp b/src/world.cpp
index 924d456..3322b9f 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -56,7 +56,6 @@ World::World(const std::string& filename)
   apply_bonuses();
 
   scrolling_timer.init(true);
-  bullets_timer.init(true);
 }
 
 World::World(const std::string& subset, int level_nr)
@@ -78,7 +77,6 @@ World::World(const std::string& subset, int level_nr)
   apply_bonuses();
 
   scrolling_timer.init(true);
-  bullets_timer.init(true);
 }
 
 void
@@ -543,11 +541,9 @@ World::add_upgrade(float x, float y, Direction dir, UpgradeKind kind)
 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);

diff --git a/src/world.h b/src/world.h
index 58dccfc..e62ce66 100644 (file)
--- a/src/world.h
+++ b/src/world.h
@@ -58,7 +58,6 @@ public:
   std::vector<FloatingScore*> floating_scores;
 
   std::vector<Upgrade> upgrades;
-  Timer bullets_timer;
   std::vector<Bullet> bullets;
   typedef std::vector<ParticleSystem*> ParticleSystems;
   ParticleSystems particle_systems;