[Pingus-CVS] CVS: Games/Pingus/src/actions faller.cxx,1.22,1.23 smashed.cxx,1.7,1.8 smashed.hxx,1.8,1.9 splashed.hxx,1.8,1.9

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv1172/actions

Modified Files:
        faller.cxx smashed.cxx smashed.hxx splashed.hxx 
Log Message:
- fixed FakeExit
- fixed rain/snow

Index: faller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- faller.cxx  14 Sep 2002 19:06:33 -0000      1.22
+++ faller.cxx  16 Sep 2002 16:47:41 -0000      1.23
@@ -152,7 +152,7 @@
   if (is_tumbling()) {
     gc.draw(tumbler, pingu->get_pos ());
   } else {
-    gc.draw(tumbler, pingu->get_pos ());
+    gc.draw(faller, pingu->get_pos ());
   }
 }
 
@@ -160,8 +160,8 @@
 Faller::is_tumbling () const
 {
   // If we are going fast enough to get smashed, start tumbling
-  if (   fabs(pingu->get_velocity().x) > deadly_velocity
-        || fabs(pingu->get_velocity().y) > deadly_velocity)
+  if (fabs(pingu->get_velocity().x) > deadly_velocity
+      || fabs(pingu->get_velocity().y) > deadly_velocity)
     {
       return true;
     }

Index: smashed.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/smashed.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smashed.cxx 14 Sep 2002 19:06:33 -0000      1.7
+++ smashed.cxx 16 Sep 2002 16:47:41 -0000      1.8
@@ -27,8 +27,9 @@
 void
 Smashed::init (void)
 {
-  sprite = Sprite ("Pingus/bomber0", "pingus");
+  sprite = Sprite("Pingus/bomber0", "pingus");
   sound_played = false;  
+  sprite.set_align_center_bottom();
 }
 
 void 
@@ -38,10 +39,12 @@
 }
 
 void
-Smashed::update(float /*delta*/)
+Smashed::update(float delta)
 {
+  sprite.update(delta);
   //  pingu->particle->add_pingu_explo(pingu->x_pos, pingu->y_pos - 16);
-  pingu->set_status(PS_DEAD);
+  if (sprite.finished())
+    pingu->set_status(PS_DEAD);
 }
 
 } // namespace Actions

Index: smashed.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/smashed.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smashed.hxx 10 Sep 2002 19:24:19 -0000      1.8
+++ smashed.hxx 16 Sep 2002 16:47:41 -0000      1.9
@@ -25,6 +25,8 @@
 
 namespace Actions {
 
+/** FIXME: this action doesn't have a purpose, its pretty much equal
+    to the new splashed action */
 class Smashed : public PinguAction
 {
 private:

Index: splashed.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/splashed.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- splashed.hxx        10 Sep 2002 19:24:19 -0000      1.8
+++ splashed.hxx        16 Sep 2002 16:47:41 -0000      1.9
@@ -42,6 +42,7 @@
   void update (float delta);
 
   bool catchable () { return false; }
+  bool change_allowed (Actions::ActionName) { return false; }
   
 private:
   Splashed (const Splashed&);