[Pingus-CVS] r4075 - in trunk/pingus/src/pingus: . actions worldobjs

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-08 01:05:32 +0100 (Sun, 08 Nov 2009)
New Revision: 4075

Modified:
   trunk/pingus/src/pingus/actions/angel.cpp
   trunk/pingus/src/pingus/actions/bomber.cpp
   trunk/pingus/src/pingus/actions/drown.cpp
   trunk/pingus/src/pingus/actions/exiter.cpp
   trunk/pingus/src/pingus/actions/laser_kill.cpp
   trunk/pingus/src/pingus/actions/smashed.cpp
   trunk/pingus/src/pingus/actions/splashed.cpp
   trunk/pingus/src/pingus/actions/superman.cpp
   trunk/pingus/src/pingus/pingu.cpp
   trunk/pingus/src/pingus/pingu.hpp
   trunk/pingus/src/pingus/pingu_enums.hpp
   trunk/pingus/src/pingus/pingu_holder.cpp
   trunk/pingus/src/pingus/world.cpp
   trunk/pingus/src/pingus/worldobjs/exit.cpp
   trunk/pingus/src/pingus/worldobjs/guillotine.cpp
   trunk/pingus/src/pingus/worldobjs/spike.cpp
Log:
Moved PinguStatus into Pingu class


Modified: trunk/pingus/src/pingus/actions/angel.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.cpp   2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/actions/angel.cpp   2009-11-08 00:05:32 UTC (rev 
4075)
@@ -40,7 +40,7 @@
 
   // Out of screen, let the pingu die
   if (pingu->get_y() < -32)
-    pingu->set_status (PS_DEAD);
+    pingu->set_status (Pingu::PS_DEAD);
 }
 
 void

Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp  2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/actions/bomber.cpp  2009-11-08 00:05:32 UTC (rev 
4075)
@@ -111,7 +111,7 @@
   // The pingu explode
   if (sprite[pingu->direction].is_finished ())
   {
-    pingu->set_status(PS_DEAD);
+    pingu->set_status(Pingu::PS_DEAD);
   }
 }
 

Modified: trunk/pingus/src/pingus/actions/drown.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.cpp   2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/actions/drown.cpp   2009-11-08 00:05:32 UTC (rev 
4075)
@@ -43,7 +43,7 @@
   sprite[pingu->direction].update();
   if (sprite[pingu->direction].is_finished())
   {
-    pingu->set_status(PS_DEAD);
+    pingu->set_status(Pingu::PS_DEAD);
   }
 }
 

Modified: trunk/pingus/src/pingus/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.cpp  2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/actions/exiter.cpp  2009-11-08 00:05:32 UTC (rev 
4075)
@@ -46,9 +46,9 @@
 
   if (sprite[pingu->direction].is_finished())
   {
-    if (pingu->get_status() != PS_EXITED)
+    if (pingu->get_status() != Pingu::PS_EXITED)
     {
-      pingu->set_status(PS_EXITED);
+      pingu->set_status(Pingu::PS_EXITED);
     }
   }
 }

Modified: trunk/pingus/src/pingus/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.cpp      2009-11-07 18:16:01 UTC 
(rev 4074)
+++ trunk/pingus/src/pingus/actions/laser_kill.cpp      2009-11-08 00:05:32 UTC 
(rev 4075)
@@ -39,7 +39,7 @@
 LaserKill::update ()
 {
   if (sprite[pingu->direction].is_finished())
-    pingu->set_status(PS_DEAD);
+    pingu->set_status(Pingu::PS_DEAD);
   else
     sprite[pingu->direction].update();
 }

Modified: trunk/pingus/src/pingus/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-08 00:05:32 UTC (rev 
4075)
@@ -41,7 +41,7 @@
   sprite.update();
   //  pingu->particle->add_pingu_explo(pingu->x_pos, pingu->y_pos - 16);
   if (sprite.is_finished())
-    pingu->set_status(PS_DEAD);
+    pingu->set_status(Pingu::PS_DEAD);
 }
 
 } // namespace Actions

Modified: trunk/pingus/src/pingus/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.cpp        2009-11-07 18:16:01 UTC 
(rev 4074)
+++ trunk/pingus/src/pingus/actions/splashed.cpp        2009-11-08 00:05:32 UTC 
(rev 4075)
@@ -45,7 +45,7 @@
 
   if (sprite.is_finished())
   {
-    pingu->set_status(PS_DEAD);
+    pingu->set_status(Pingu::PS_DEAD);
   }
 }
 

Modified: trunk/pingus/src/pingus/actions/superman.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/superman.cpp        2009-11-07 18:16:01 UTC 
(rev 4074)
+++ trunk/pingus/src/pingus/actions/superman.cpp        2009-11-08 00:05:32 UTC 
(rev 4075)
@@ -37,7 +37,7 @@
   pingu->set_pos(pingu->get_x() + 40.0f * 0.025f, pingu->get_y() - 200.0f * 
0.025f);
 
   if (pingu->get_y() < -32)
-    pingu->set_status(PS_DEAD);
+    pingu->set_status(Pingu::PS_DEAD);
 }
 
 void

Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp   2009-11-07 18:16:01 UTC (rev 4074)
+++ trunk/pingus/src/pingus/pingu.cpp   2009-11-08 00:05:32 UTC (rev 4075)
@@ -277,13 +277,13 @@
   return false;
 }
 
-PinguStatus
+Pingu::PinguStatus
 Pingu::get_status (void) const
 {
   return status;
 }
 
-PinguStatus
+Pingu::PinguStatus
 Pingu::set_status (PinguStatus s)
 {
   return (status = s);

Modified: trunk/pingus/src/pingus/pingu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu.hpp   2009-11-07 18:16:01 UTC (rev 4074)
+++ trunk/pingus/src/pingus/pingu.hpp   2009-11-08 00:05:32 UTC (rev 4075)
@@ -32,6 +32,16 @@
     objects. */
 class Pingu
 {
+public:
+  /** The Pingus Status shows the current status of a Pingu, as
+      displayed in the PingusCounter pannel. PS_DEAD are pingus that got
+      killed, PS_ALIVE are pingus that are still active in the world and
+      PS_EXITED are pingus that successfully finished a level
+
+      FIXME: different subvalues of PS_DEAD might be usefull (drowned,
+      FIXME: splashed, smashed, etc.) */
+  enum PinguStatus { PS_ALIVE, PS_EXITED, PS_DEAD };
+
 private:
   /** The primary action with is currently in use */
   boost::shared_ptr<PinguAction> action;

Modified: trunk/pingus/src/pingus/pingu_enums.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.hpp     2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/pingu_enums.hpp     2009-11-08 00:05:32 UTC (rev 
4075)
@@ -19,15 +19,6 @@
 
 #include <string>
 
-/** The Pingus Status shows the current status of a Pingu, as
-    displayed in the PingusCounter pannel. PS_DEAD are pingus that got
-    killed, PS_ALIVE are pingus that are still active in the world and
-    PS_EXITED are pingus that successfully finished a level
-
-    FIXME: different subvalues of PS_DEAD might be usefull (drowned,
-    FIXME: splashed, smashed, etc.) */
-enum PinguStatus { PS_ALIVE, PS_EXITED, PS_DEAD };
-
 namespace Actions {
 
 /** The order of the actions here are the same as the order of actions

Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp    2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/pingu_holder.cpp    2009-11-08 00:05:32 UTC (rev 
4075)
@@ -96,14 +96,14 @@
 
     // FIXME: The draw-loop is not the place for things like this,
     // this belongs in the update loop
-    if ((*pingu)->get_status() == PS_DEAD)
+    if ((*pingu)->get_status() == Pingu::PS_DEAD)
     {
       // Removing the dead pingu and setting the iterator back to
       // the correct possition, no memory hole since pingus will
       // keep track of the allocated Pingus
       pingu = pingus.erase(pingu);
     }
-    else if ((*pingu)->get_status() == PS_EXITED)
+    else if ((*pingu)->get_status() == Pingu::PS_EXITED)
     {
       number_of_exited += 1;
       pingu = pingus.erase(pingu);
@@ -125,7 +125,7 @@
 
     assert(pingu->get_id() == id_);
 
-    if (pingu->get_status() == PS_ALIVE)
+    if (pingu->get_status() == Pingu::PS_ALIVE)
       return pingu;
     else
       return 0;

Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp   2009-11-07 18:16:01 UTC (rev 4074)
+++ trunk/pingus/src/pingus/world.cpp   2009-11-08 00:05:32 UTC (rev 4075)
@@ -150,7 +150,7 @@
       {
         Pingu* pingu = pingus->get_pingu(armageddon_count);
 
-        if (pingu && pingu->get_status() == PS_ALIVE)
+        if (pingu && pingu->get_status() == Pingu::PS_ALIVE)
         {
           pingu->request_set_action(BOMBER);
           break;

Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.cpp  2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp  2009-11-08 00:05:32 UTC (rev 
4075)
@@ -90,8 +90,8 @@
              && (*pingu)->get_pos().y > pos.y - 5 && (*pingu)->get_pos().y < 
pos.y + 2)
       {
         // Now, make sure the pingu isn't already exiting, gone, or dead
-        if (   (*pingu)->get_status() != PS_EXITED
-               && (*pingu)->get_status() != PS_DEAD
+        if (   (*pingu)->get_status() != Pingu::PS_EXITED
+               && (*pingu)->get_status() != Pingu::PS_DEAD
                && (*pingu)->get_action() != Actions::EXITER)
         {
           // Pingu actually exits

Modified: trunk/pingus/src/pingus/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.cpp    2009-11-07 18:16:01 UTC 
(rev 4074)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp    2009-11-08 00:05:32 UTC 
(rev 4075)
@@ -89,7 +89,7 @@
                           static_cast<int>(pos.x + 42), static_cast<int>(pos.y 
+ 98)))
     {
       killing = true;
-      pingu->set_status(PS_DEAD);
+      pingu->set_status(Pingu::PS_DEAD);
       direction = pingu->direction;
       sprite_kill_left.restart();
       sprite_kill_right.restart();

Modified: trunk/pingus/src/pingus/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-07 18:16:01 UTC (rev 
4074)
+++ trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-08 00:05:32 UTC (rev 
4075)
@@ -76,7 +76,7 @@
         && pingu->get_pos().x > pos.x +16 - 12 && pingu->get_pos().x < pos.x + 
16 + 12
         && pingu->get_pos().y > pos.y          && pingu->get_pos().y < pos.y + 
32)
     {
-      pingu->set_status(PS_DEAD);
+      pingu->set_status(Pingu::PS_DEAD);
     }
   }
 }