[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.20,1.21 Entrance.cc,1.29,1.30 Pingu.cc,1.75,1.76 PinguAction.cc,1.25,1.26 PinguActionFactory.cc,1.5,1.6 PinguHolder.cc,1.20,1.21 Theme.cc,1.34,1.35 View.cc,1.18,1.19

[grumbel]

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

Modified Files:
        CaptureRectangle.cc Entrance.cc Pingu.cc PinguAction.cc 
        PinguActionFactory.cc PinguHolder.cc Theme.cc View.cc 
Log Message:
fixed yesterdays bug and removed the debugging std::cout's 

Index: CaptureRectangle.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/CaptureRectangle.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CaptureRectangle.cc 9 Jun 2002 00:56:25 -0000       1.20
+++ CaptureRectangle.cc 9 Jun 2002 11:18:50 -0000       1.21
@@ -52,11 +52,7 @@
 void
 CaptureRectangle::draw_offset(int x_offset, int y_offset, float s)
 { 
-  if (!pingu) 
-    {
-      return;
-    } 
-  else if (pingu->catchable ())
+  if (pingu && pingu->catchable ())
     {
       Sprite * sur;
       

Index: Entrance.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Entrance.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Entrance.cc 9 Jun 2002 00:56:25 -0000       1.29
+++ Entrance.cc 9 Jun 2002 11:18:50 -0000       1.30
@@ -37,8 +37,6 @@
   last_release = -release_rate;
   direction = data.direction;
   owner_id = data.owner_id;
-
-  std::cout << "XXXXXXXXXXX: Entrance: owner_id: " << owner_id << std::endl;
 }
 
 bool
@@ -58,9 +56,7 @@
   static int last_direction;
   Direction d;
 
-  std::cout << "XXX Entrance::get_pingu()" << std::endl;
   Pingu* pingu = world->get_pingu_p()->create_pingu (pos, owner_id);
-  std::cout << "XXX Pingu created" << std::endl;
   switch (direction) 
     {
     case EntranceData::LEFT:
@@ -93,8 +89,6 @@
       pingu->set_direction(d);
       break;
     }
-
-  std::cout << "XXX Entrance::get_pingu(): done" << std::endl;
   return pingu;
 }
 

Index: Pingu.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Pingu.cc,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- Pingu.cc    9 Jun 2002 00:56:25 -0000       1.75
+++ Pingu.cc    9 Jun 2002 11:18:50 -0000       1.76
@@ -53,8 +53,6 @@
     owner_id (owner),
     pos (arg_pos)
 {
-  std::cout << "XXXXXXXXXXX: Pingu: owner_id: " << owner_id << std::endl;
-
   action_time = -1;
 
   direction.left ();
@@ -63,7 +61,6 @@
   velocity.x = 0;
   velocity.y = 0;
 
-  std::cout << "XXX setting action" << std::endl;
   set_action("faller");
 }
 
@@ -119,8 +116,6 @@
 {
   assert(act);
 
-  std::cout << "XXX Action:" << act << std::endl;
-
   if (status == PS_DEAD)
     {
       if (pingus_debug_flags & PINGUS_DEBUG_ACTIONS)
@@ -128,7 +123,6 @@
       return 0;
     }
 
-  std::cout << "1. Pingu" << id << "::set_action(PinguAction* act): " << this 
<< std::endl;
   act->set_pingu(this);
 
   // Use the activation time of the action
@@ -214,7 +208,6 @@
 Pingu::set_paction(PinguAction* act) 
 {
   action = act;
-  std::cout << "2. Pingu::set_paction(PinguAction* act): " << this << 
std::endl;
   action->set_pingu(this);
 }
 
@@ -307,7 +300,6 @@
   if (action_time == 0 && countdown_action) 
     {
       action = countdown_action;
-      std::cout << "3. Pingu::set_action(PinguAction* act): " << this << 
std::endl;
       action->set_pingu(this);
     }
   

Index: PinguAction.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguAction.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- PinguAction.cc      9 Jun 2002 00:56:25 -0000       1.25
+++ PinguAction.cc      9 Jun 2002 11:18:50 -0000       1.26
@@ -40,8 +40,6 @@
 void
 PinguAction::set_pingu(Pingu* pingu_data)
 {
-  std::cout << "PinguAction::set_pingu(" << pingu << ")" << std::endl;
-  std::cout << "Pingu:X: " << pingu->get_pos ().x << std::endl;;
   pingu = pingu_data;
   assert(pingu);
   init();

Index: PinguActionFactory.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguActionFactory.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PinguActionFactory.cc       9 Jun 2002 00:56:25 -0000       1.5
+++ PinguActionFactory.cc       9 Jun 2002 11:18:50 -0000       1.6
@@ -102,7 +102,7 @@
     throw PingusError("PinguActionFactory: Invalid id: " + id);
   else 
     {
-      PinguAction* action;
+      PinguAction* action = it->second->create ();
       all_actions.push_back (action);
       return action;
     }

Index: PinguHolder.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguHolder.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PinguHolder.cc      9 Jun 2002 00:56:25 -0000       1.20
+++ PinguHolder.cc      9 Jun 2002 11:18:50 -0000       1.21
@@ -55,11 +55,7 @@
 Pingu*
 PinguHolder::create_pingu (const CL_Vector& pos, int owner_id)
 {
-  std::cout << "XXXXXXXXXXX: PinguHolder: owner_id: " << owner_id << std::endl;
-
   Pingu* pingu = new Pingu (pos, owner_id);
-  std::cout << "XXXXX: Allocating new pingu done" << std::endl;
-  
   // This list will get evaluated and deleted and destruction
   all_pingus.push_back (pingu);
 

Index: Theme.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Theme.cc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Theme.cc    19 Jan 2002 16:13:46 -0000      1.34
+++ Theme.cc    9 Jun 2002 11:18:50 -0000       1.35
@@ -180,8 +180,6 @@
 
   for(std::vector<std::string>::iterator i = levelnames.begin(); i != 
levelnames.end(); ++i)
     {
-      //std::cout << "XXX Level: " << *i << ": " << i << std::endl;
-
       if (j > accessible_levels) 
        {
          // Level is not yet accessible

Index: View.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- View.cc     8 Jun 2002 20:19:54 -0000       1.18
+++ View.cc     9 Jun 2002 11:18:50 -0000       1.19
@@ -30,7 +30,8 @@
 World* View::world;
 
 View::View(int x1, int y1, int x2, int y2, float s)
-  : controller (new MouseController ()) 
+  : current_pingu (0),
+    controller (new MouseController ()) 
 {
   assert(world);