[Pingus-CVS] CVS: Games/Pingus/src/traps fake_exit.cxx,1.2,1.3 hammer.cxx,1.2,1.3 laser_exit.cxx,1.2,1.3 smasher.cxx,1.3,1.4

[grumbel]

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

Modified Files:
        fake_exit.cxx hammer.cxx laser_exit.cxx smasher.cxx 
Log Message:
cleaned up the set_paction/set_action confusing and renamed set_action to 
request_set_action (should only be used by the GUI) and set_paction to 
set_action (shoud be used by other actions, traps, pingus, etc.)


Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/fake_exit.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fake_exit.cxx       19 Jun 2002 15:19:26 -0000      1.2
+++ fake_exit.cxx       26 Jun 2002 17:43:18 -0000      1.3
@@ -72,7 +72,7 @@
       }
 
       if (counter >= 3 && counter <= 5) {
-       pingu->set_action(PinguActionFactory::instance ()->create ("smashed"));
+       pingu->set_action("smashed");
       }
     }
 }

Index: hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/hammer.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hammer.cxx  13 Jun 2002 14:25:13 -0000      1.2
+++ hammer.cxx  26 Jun 2002 17:43:18 -0000      1.3
@@ -68,7 +68,7 @@
   if (counter >= (int)(surface.get_num_frames()) - 3) {
     if (pingu->get_x() > pos.x + 55 && pingu->get_x() < pos.x + 77
        && pingu->get_y() > pos.y + 146 && pingu->get_y() < pos.y + 185)
-      pingu->set_action(PinguActionFactory::instance ()->create ("smashed"));
+      pingu->set_action("smashed");
   }
 }
 

Index: laser_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/laser_exit.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- laser_exit.cxx      13 Jun 2002 14:25:13 -0000      1.2
+++ laser_exit.cxx      26 Jun 2002 17:43:18 -0000      1.3
@@ -77,7 +77,7 @@
          if (!(pingu->get_action() && pingu->get_action()->get_name() == 
"LaserKill")) 
            {
              killing = true;
-             pingu->set_action(PinguActionFactory::instance ()->create 
("laserkill"));
+             pingu->set_action("laserkill");
            }
        }
     }

Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/smasher.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smasher.cxx 19 Jun 2002 15:19:26 -0000      1.3
+++ smasher.cxx 26 Jun 2002 17:43:18 -0000      1.4
@@ -70,7 +70,7 @@
                  if ((*pingu)->is_inside (int(pos.x + 30), int(pos.y + 90),
                                           int(pos.x + 250), int(pos.y + 190)))
                    {
-                     (*pingu)->set_action (PinguActionFactory::instance 
()->create ("splashed"));
+                     (*pingu)->set_action ("splashed");
                    }
                }
            }