[Pingus-CVS] CVS: Games/Pingus/src button_panel.cxx,1.2,1.3 button_panel.hxx,1.1,1.2 pingus_counter.cxx,1.2,1.3 pingus_counter.hxx,1.1,1.2 playfield.cxx,1.2,1.3 playfield.hxx,1.1,1.2 smallmap.cxx,1.2,1.3 smallmap.hxx,1.1,1.2 world.cxx,1.4,1.5

[torangan]

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

Modified Files:
        button_panel.cxx button_panel.hxx pingus_counter.cxx 
        pingus_counter.hxx playfield.cxx playfield.hxx smallmap.cxx 
        smallmap.hxx world.cxx 
Log Message:
Removed caching pointers


Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- button_panel.cxx    13 Jun 2002 14:25:12 -0000      1.2
+++ button_panel.cxx    17 Jun 2002 15:45:26 -0000      1.3
@@ -130,7 +130,6 @@
 ButtonPanel::set_server(Server* s)
 {
   server = s;
-  world = server->get_world();
 
   for(AButtonIter button = a_buttons.begin(); button != a_buttons.end(); 
++button) 
     {
@@ -180,7 +179,7 @@
              arma_counter = 0;
              armageddon_pressed = 4;
              armageddon->pressed = true;
-             world->armageddon();
+             server->get_world()->armageddon();
            }
          return;
        }

Index: button_panel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- button_panel.hxx    12 Jun 2002 19:04:45 -0000      1.1
+++ button_panel.hxx    17 Jun 2002 15:45:26 -0000      1.2
@@ -28,7 +28,6 @@
 class CL_Key;
 class Client;
 class PLF;
-class World;
 class Controller;
 
 class ButtonPanel : public GuiObj
@@ -52,7 +51,6 @@
   bool left_pressed;
   unsigned int  last_press;
   static CL_Surface button_cap;
-  World* world;
 
   Controller* controller;
 

Index: pingus_counter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingus_counter.cxx  13 Jun 2002 14:25:12 -0000      1.2
+++ pingus_counter.cxx  17 Jun 2002 15:45:26 -0000      1.3
@@ -44,6 +44,8 @@
 
   background.put_screen (CL_Display::get_width ()/2 - 
background.get_width()/2, 0);
   
+  World* world = client->get_server()->get_world();
+  
   // FIXME: Buffer overflow...
   sprintf(str, _("Released: %3d/%3d  Out: %3d  Saved: %3d/%3d"),
          world->get_released_pingus(),
@@ -59,7 +61,6 @@
 PingusCounter::set_client(Client* c)
 {
   client = c;
-  world = client->get_server()->get_world();
 }
 
 /* EOF */

Index: pingus_counter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingus_counter.hxx  12 Jun 2002 19:06:12 -0000      1.1
+++ pingus_counter.hxx  17 Jun 2002 15:45:26 -0000      1.2
@@ -33,8 +33,6 @@
   CL_Font* font;
   CL_Surface background;
   ///
-  World* world;
-  ///
   Client* client;
 public:
   ///

Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- playfield.cxx       13 Jun 2002 14:25:12 -0000      1.2
+++ playfield.cxx       17 Jun 2002 15:45:26 -0000      1.3
@@ -35,7 +35,6 @@
   : controller (arg_controller)
 {
   world = w;
-  pingus = world->get_pingu_p();
   mouse_scrolling = false;
   View::set_world(world);
 
@@ -127,7 +126,7 @@
   double dist;
   Pingu* c_pingu = 0;
 
-  for (PinguIter pingu=pingus->begin(); pingu != pingus->end(); pingu++)
+  for (PinguIter pingu = world->get_pingu_p()->begin(); pingu != 
world->get_pingu_p()->end(); pingu++)
     {
       if ((*pingu)->is_over(x_pos, y_pos))
        {

Index: playfield.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- playfield.hxx       12 Jun 2002 19:06:13 -0000      1.1
+++ playfield.hxx       17 Jun 2002 15:45:26 -0000      1.2
@@ -28,7 +28,6 @@
 class World;
 class Server;
 class PinguInfo;
-class PinguHolder;
 class ButtonPanel;
 class Controller;
 
@@ -43,7 +42,6 @@
   Client* client;
   ///Range x_offset2, y_offset2;
   ButtonPanel* buttons;
-  PinguHolder* pingus;
   PinguInfo* pingu_info;
   World* world;
   std::vector<View*> view;

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smallmap.cxx        13 Jun 2002 14:25:12 -0000      1.2
+++ smallmap.cxx        17 Jun 2002 15:45:26 -0000      1.3
@@ -56,11 +56,9 @@
   entrance_sur = PingusResource::load_surface("misc/smallmap_entrance", 
"core");
   exit_sur     = PingusResource::load_surface("misc/smallmap_exit", "core");
 
-  world = client->get_server()->get_world();
-
-  colmap = world->get_colmap(); 
+  ColMap* colmap = client->get_server()->get_world()->get_colmap(); 
   buffer = colmap->get_data();
-  plf = world->get_plf();
+  //Plf* plf = world->get_plf();
 
   canvas = new CL_Canvas(width, height);
  

Index: smallmap.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smallmap.hxx        12 Jun 2002 19:09:38 -0000      1.1
+++ smallmap.hxx        17 Jun 2002 15:45:26 -0000      1.2
@@ -22,7 +22,6 @@
 
 #include "gui_obj.hxx"
 
-class ColMap;
 
 ///
 class Client;
@@ -30,9 +29,6 @@
 class SmallMap : public GuiObj
 {
 private:
-  PLF*    plf;
-  ColMap* colmap;
-  World*  world;
   Client* client;
 
   CL_Surface exit_sur;

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- world.cxx   14 Jun 2002 13:40:10 -0000      1.4
+++ world.cxx   17 Jun 2002 15:45:26 -0000      1.5
@@ -82,7 +82,6 @@
 {
   delete particle_holder;
   
-  // skip PingusHolder at the first position to delete it last
   for (WorldObjIter it = world_obj->begin(); it != world_obj->end(); ++it) {
     delete *it;
   }