[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx,1.5,1.6 fake_exit.cxx,1.9,1.10 hammer.cxx,1.9,1.10 laser_exit.cxx,1.8,1.9 smasher.cxx,1.12,1.13

[grumbel]

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

Modified Files:
        exit.cxx fake_exit.cxx hammer.cxx laser_exit.cxx smasher.cxx 
Log Message:
removed PinguAction* from the public API
- added Gervases experimental bomber code

Index: exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exit.cxx    10 Oct 2002 12:25:54 -0000      1.5
+++ exit.cxx    12 Oct 2002 00:24:26 -0000      1.6
@@ -93,7 +93,7 @@
        {
          if (   (*pingu)->get_status() != PS_EXITED
              && (*pingu)->get_status() != PS_DEAD
-             && (*pingu)->get_action()->get_type() != Actions::Exiter)
+             && (*pingu)->get_action() != Actions::Exiter)
            {
              (*pingu)->set_action(Actions::Exiter);
            }

Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fake_exit.cxx       4 Oct 2002 13:46:56 -0000       1.9
+++ fake_exit.cxx       12 Oct 2002 00:24:26 -0000      1.10
@@ -79,7 +79,7 @@
   if (   pingu->get_x() > data->pos.x + 31 && pingu->get_x() < data->pos.x + 
31 + 15
       && pingu->get_y() > data->pos.y + 56 && pingu->get_y() < data->pos.y + 
56 + 56) 
     {
-      if (pingu->get_action()->get_type() != Actions::Splashed)
+      if (pingu->get_action() != Actions::Splashed)
        {
          if (!smashing) {
            data->counter = 0;

Index: hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/hammer.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hammer.cxx  4 Oct 2002 13:46:56 -0000       1.9
+++ hammer.cxx  12 Oct 2002 00:24:26 -0000      1.10
@@ -62,7 +62,7 @@
       for (PinguIter pingu_it = holder->begin (); pingu_it != holder->end (); 
++pingu_it) 
        {
          Pingu* pingu = *pingu_it;
-         if (pingu->get_action()->get_type() != Actions::Splashed)
+         if (pingu->get_action() != Actions::Splashed)
            {
              if (pingu->get_x() > data->pos.x + 55  && pingu->get_x() < 
data->pos.x + 77
                    && pingu->get_y() > data->pos.y + 146 && pingu->get_y() < 
data->pos.y + 185)

Index: laser_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- laser_exit.cxx      4 Oct 2002 13:46:56 -0000       1.8
+++ laser_exit.cxx      12 Oct 2002 00:24:26 -0000      1.9
@@ -81,7 +81,7 @@
       if (   pingu->get_x () < data->pos.x + 34 + 10 && pingu->get_x () > 
data->pos.x + 34 
             && pingu->get_y () < data->pos.y + 43 + 20 && pingu->get_y () > 
data->pos.y + 43) 
        {
-         if (pingu->get_action()->get_type() != Actions::Laserkill) 
+         if (pingu->get_action() != Actions::Laserkill) 
            {
              killing = true;
              pingu->set_action(Actions::Laserkill);

Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- smasher.cxx 4 Oct 2002 13:46:56 -0000       1.12
+++ smasher.cxx 12 Oct 2002 00:24:26 -0000      1.13
@@ -88,7 +88,7 @@
                                          static_cast<int>(data->pos.x + 250),
                                          static_cast<int>(data->pos.y + 190)))
                    {
-                     if ((*pingu)->get_action()->get_type() != 
Actions::Splashed)
+                     if ((*pingu)->get_action() != Actions::Splashed)
                        (*pingu)->set_action(Actions::Splashed);
                    }
                }
@@ -138,7 +138,7 @@
          && pingu->get_x() > data->pos.x + 190
          && pingu->get_x() < data->pos.x + 210))
     {
-      if (pingu->get_action()->get_type() != Actions::Splashed)
+      if (pingu->get_action() != Actions::Splashed)
        {
          if (!smashing) 
            {