super-tux-commit

[Marek M. <wa...@us...>]

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

Modified Files:
	dispenser.cpp dispenser.h 
Log Message:
made badguy dispenser cycle configurable in level file


Index: dispenser.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dispenser.cpp	24 Nov 2004 17:33:50 -0000	1.1
+++ dispenser.cpp	24 Nov 2004 17:45:26 -0000	1.2
@@ -3,12 +3,11 @@
 #include "dispenser.h"
 #include "badguy/bouncing_snowball.h"
 
-#define DISPENSE_TIME 3
-
 Dispenser::Dispenser(LispReader& reader)
 {
   reader.read_float("x", start_position.x);
   reader.read_float("y", start_position.y);
+  reader.read_float("cycle", cycle);
   reader.read_string("badguy", badguy);
   bbox.set_size(32, 32);
   sprite = sprite_manager->create("snowball");
@@ -21,6 +20,7 @@
 
   writer.write_float("x", get_pos().x);
   writer.write_float("y", get_pos().y);
+  writer.write_float("cycle", cycle);
   writer.write_string("badguy", badguy);
 
   writer.end_list("dispenser");
@@ -29,7 +29,7 @@
 void
 Dispenser::activate()
 {
-   dispense_timer.start(DISPENSE_TIME, true);
+   dispense_timer.start(cycle, true);
 }
 
 bool

Index: dispenser.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dispenser.h	24 Nov 2004 17:33:50 -0000	1.1
+++ dispenser.h	24 Nov 2004 17:45:26 -0000	1.2
@@ -16,6 +16,7 @@
 
 protected:
   bool collision_squished(Player& player);
+  float cycle;
   std::string badguy;
   Timer2 dispense_timer;
 };