[Pingus-CVS] CVS: Games/Pingus/src CaptureRectangle.cc,1.16,1.17 CaptureRectangle.hh,1.12,1.13 Entrance.cc,1.27,1.28 Entrance.hh,1.19,1.20 MultiplayerClientChild.cc,1.10,1.11 PinguHolder.cc,1.17,1.18 PinguHolder.hh,1.14,1.15 PinguInfo.cc,1.10,1.11 PinguInfo.hh,1.5,1.6 Playfield.cc,1.31,1.32 Playfield.hh,1.21,1.22 PlayfieldView.cc,1.6,1.7 PlayfieldView.hh,1.5,1.6 Server.cc,1.25,1.26 SmallMap.cc,1.39,1.40 Trap.hh,1.20,1.21 View.cc,1.16,1.17 View.hh,1.9,1.10 World.cc,1.68,1.69 World.hh,1.33,1.34 WorldObj.cc,1.20,1.21 WorldObj.hh,1.22,1.23

[grumbel]

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

Modified Files:
        CaptureRectangle.cc CaptureRectangle.hh Entrance.cc 
        Entrance.hh MultiplayerClientChild.cc PinguHolder.cc 
        PinguHolder.hh PinguInfo.cc PinguInfo.hh Playfield.cc 
        Playfield.hh PlayfieldView.cc PlayfieldView.hh Server.cc 
        SmallMap.cc Trap.hh View.cc View.hh World.cc World.hh 
        WorldObj.cc WorldObj.hh 
Log Message:
replaced boost::shared_ptr<Pingu> with Pingu*

Index: CaptureRectangle.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/CaptureRectangle.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CaptureRectangle.cc 7 Jun 2002 14:50:34 -0000       1.16
+++ CaptureRectangle.cc 8 Jun 2002 16:08:16 -0000       1.17
@@ -32,7 +32,7 @@
 
 using namespace boost;
 
-shared_ptr<Pingu> CaptureRectangle::pingu; 
+Pingu* CaptureRectangle::pingu; 
 shared_ptr<PinguAction> CaptureRectangle::button_action;
 
 CaptureRectangle::CaptureRectangle()
@@ -56,7 +56,7 @@
 void
 CaptureRectangle::draw_offset(int x_offset, int y_offset, float s)
 { 
-  if (!pingu.get()) 
+  if (!pingu) 
     {
       return;
     } 
@@ -127,7 +127,7 @@
 }
 
 void
-CaptureRectangle::set_pingu(shared_ptr<Pingu> p)
+CaptureRectangle::set_pingu(Pingu* p)
 {
   pingu = p; 
 }

Index: CaptureRectangle.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/CaptureRectangle.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CaptureRectangle.hh 7 Jun 2002 13:25:02 -0000       1.12
+++ CaptureRectangle.hh 8 Jun 2002 16:08:16 -0000       1.13
@@ -37,7 +37,7 @@
 class CaptureRectangle
 {
 private:
-  static boost::shared_ptr<Pingu>       pingu; 
+  static Pingu*       pingu; 
   static boost::shared_ptr<PinguAction> button_action;
 
   /// The id of the owner of this capture rectangle
@@ -50,19 +50,13 @@
 
   CL_Font* font;
 public:
-  ///
   CaptureRectangle();  
-  ///
   virtual ~CaptureRectangle(); 
   
-  ///
   static void load_data();
-  ///
-  static void set_pingu(boost::shared_ptr<Pingu> pingu);  
-  ///
+  static void set_pingu(Pingu* pingu);  
   static void set_action(boost::shared_ptr<PinguAction>);
 
-  ///
   void draw_offset(int x_offset, int y_offset, float s = 1.0); 
 };
 

Index: Entrance.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Entrance.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Entrance.cc 1 Jun 2002 18:05:34 -0000       1.27
+++ Entrance.cc 8 Jun 2002 16:08:16 -0000       1.28
@@ -50,15 +50,13 @@
   }
 }
 
-boost::shared_ptr<Pingu>
+Pingu*
 Entrance::get_pingu()
 {
   static int last_direction;
   Direction d;
 
-  // FIXME: Evil, the allocated objects are destroyed in PinguHolder,
-  // FIXME: but all allocation should be encapsulated in PinguHolder.
-  boost::shared_ptr<Pingu> p (new Pingu(pos, owner_id));
+  Pingu* p (world->get_pingu_p()->create_pingu (pos, owner_id));
   
   switch (direction) 
     {
@@ -103,7 +101,7 @@
       && (world->get_released_pingus() < world->get_allowed_pingus())
       && (! world->check_armageddon()))
     {
-      world->get_pingu_p()->add (boost::shared_ptr<Pingu>(get_pingu ()));
+      world->get_pingu_p()->add (get_pingu ());
       world->inc_released_pingus();
     }
 }

Index: Entrance.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Entrance.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Entrance.hh 7 Jun 2002 20:35:14 -0000       1.19
+++ Entrance.hh 8 Jun 2002 16:08:16 -0000       1.20
@@ -41,7 +41,7 @@
 
   float get_z_pos() const { return int(pos.z); }
   virtual bool   pingu_ready(void);
-  virtual boost::shared_ptr<Pingu> get_pingu(void);
+  virtual Pingu* get_pingu(void);
   virtual void   update(float delta);
   virtual void   draw_offset(int x, int y, float s = 1.0);
 };

Index: MultiplayerClientChild.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/MultiplayerClientChild.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MultiplayerClientChild.cc   7 Jun 2002 14:50:34 -0000       1.10
+++ MultiplayerClientChild.cc   8 Jun 2002 16:08:16 -0000       1.11
@@ -63,8 +63,8 @@
   for (GuiObjIter i = gui_objs.begin (); i != gui_objs.end (); ++i)
     (*i)->draw_clipped ();
 
-  boost::shared_ptr<Pingu> pingu = playfield->get_pingu (controller->get_pos 
());
-  if (pingu.get () && pingu->get_owner () == controller->get_owner ())
+  Pingu* pingu = playfield->get_pingu (controller->get_pos ());
+  if (pingu && pingu->get_owner () == controller->get_owner ())
     capture_rect.put_screen(controller->get_pos ());
 }
 
@@ -85,8 +85,8 @@
   key.y = pos.y;
   button_panel->on_button_press(key);
 
-  boost::shared_ptr<Pingu> pingu = playfield->get_pingu (controller->get_pos 
());
-  if (pingu.get () && pingu->get_owner () == controller->get_owner ())
+  Pingu* pingu = playfield->get_pingu (controller->get_pos ());
+  if (pingu && pingu->get_owner () == controller->get_owner ())
     {
       char str[256];
       sprintf(str, "Pingu: %d:%s", pingu->get_id(), 
button_panel->get_action_name().c_str());

Index: PinguHolder.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguHolder.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- PinguHolder.cc      15 Jan 2002 10:48:49 -0000      1.17
+++ PinguHolder.cc      8 Jun 2002 16:08:16 -0000       1.18
@@ -35,8 +35,9 @@
 {
   // Deleting all Pingu objects
   std::cout << "PinguHolder: Deleting pingus" << std::endl;
-  /*  for(PinguIter pingu = pingus.begin(); pingu != pingus.end(); ++pingu) 
-      delete (*pingu);*/
+  for(std::vector<Pingu*>::iterator i = all_pingus.begin(); 
+      i != all_pingus.end(); ++i) 
+    delete *i;
 }
 
 int
@@ -46,11 +47,22 @@
 }
 
 void
-PinguHolder::add (boost::shared_ptr<Pingu> pingu)
+PinguHolder::add (Pingu* pingu)
 {
   total_size_count++;
   pingu->set_id(id_count++);
   pingus.push_back(pingu);
+}
+
+Pingu*
+PinguHolder::create_pingu (const CL_Vector& pos, int owner_id)
+{
+  Pingu* pingu = new Pingu (pos, owner_id);
+  
+  // This list will get evaluated and deleted and destruction
+  all_pingus.push_back (pingu);
+
+  return pingu;
 }
 
 void

Index: PinguHolder.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguHolder.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PinguHolder.hh      13 Aug 2001 21:35:37 -0000      1.14
+++ PinguHolder.hh      8 Jun 2002 16:08:16 -0000       1.15
@@ -21,29 +21,34 @@
 #define PINGUHOLDER_HH
 
 #include <list>
-#include "boost/smart_ptr.hpp"
 
 #include "Pingu.hh"
 #include "WorldObj.hh"
 
 class Pingu;
-///
-typedef std::list<boost::shared_ptr<Pingu> >::iterator PinguIter;
 
-///
+typedef std::list<Pingu*>::iterator PinguIter;
+
+/** This class holds all the penguins in the world */
 class PinguHolder : public WorldObj
 {
 private:
   /// The uniq id for the next Pingu
   int id_count;
-  ///
+
+  /// ???
   int total_size_count;
-  ///
+
+  /// ???
   int saved_pingus;
 
+  /** This vector holds all pingus which are ever allocated in the
+      world, its used to free them all on the end of this class. */
+  std::vector<Pingu*> all_pingus;
+
   /** A list holding all Pingus, the PinguHolder itself has only the
       active (not dead) ones */
-  std::list<boost::shared_ptr<Pingu> > pingus;
+  std::list<Pingu*> pingus;
   
 public:
   PinguHolder();
@@ -52,12 +57,21 @@
   void draw_offset(int, int, float s = 1.0);
   int  total_size();
   int  get_saved() { return saved_pingus; }
-  void add (boost::shared_ptr<Pingu> pingu);
+  
+  /** Adds a pingu to the list of active pingus (the ones that are
+      displayed and walk around) */
+  void add (Pingu* pingu);
+
+  /** Return a reference to a newly create Pingu, the PinguHolder will
+      take care of the deletion. The caller *must* not delete the
+      Pingu */
+  Pingu* create_pingu (const CL_Vector& pos, int owner_id);
+
   float get_z_pos() const { return 50; }
 
-  std::list<boost::shared_ptr<Pingu> >::iterator begin () { return 
pingus.begin (); }
-  std::list<boost::shared_ptr<Pingu> >::iterator end () { return pingus.end 
(); }
-  std::list<boost::shared_ptr<Pingu> >::size_type size () { return pingus.size 
(); }
+  std::list<Pingu*>::iterator  begin () { return pingus.begin (); }
+  std::list<Pingu*>::iterator  end ()   { return pingus.end (); }
+  std::list<Pingu*>::size_type size ()  { return pingus.size (); }
 };
 
 #endif

Index: PinguInfo.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguInfo.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PinguInfo.cc        15 Jan 2002 16:55:56 -0000      1.10
+++ PinguInfo.cc        8 Jun 2002 16:08:16 -0000       1.11
@@ -46,7 +46,7 @@
                        x_pos + CL_Display::get_width()  - 5,
                        y_pos + CL_Display::get_height() - 5,
                        0.2f, 0.2f, 0.2f, 1.0f);
-  if (pingu.get()) {
+  if (pingu) {
     char str1[256];
     char str2[256];
 
@@ -72,7 +72,7 @@
 }
 
 void
-PinguInfo::set_pingu(boost::shared_ptr<Pingu> p)
+PinguInfo::set_pingu(Pingu* p)
 {
   pingu = p;
 }

Index: PinguInfo.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PinguInfo.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PinguInfo.hh        30 Dec 2000 23:54:05 -0000      1.5
+++ PinguInfo.hh        8 Jun 2002 16:08:16 -0000       1.6
@@ -27,17 +27,13 @@
 class PinguInfo : public GuiObj
 {
 private:
-  ///
   CL_Font* font;
-  ///
-  boost::shared_ptr<Pingu> pingu;
+  Pingu* pingu;
 public:
-  ///
   PinguInfo();
-  ///
+
   void draw();
-  ///
-  void set_pingu(boost::shared_ptr<Pingu> p);
+  void set_pingu(Pingu* p);
 };
 
 #endif

Index: Playfield.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Playfield.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Playfield.cc        7 Jun 2002 19:10:33 -0000       1.31
+++ Playfield.cc        8 Jun 2002 16:08:16 -0000       1.32
@@ -121,12 +121,12 @@
     }
 }
 
-boost::shared_ptr<Pingu>
+Pingu*
 Playfield::current_pingu_find(int x_pos, int y_pos)
 {
   double min_dist = 500.0;
   double dist;
-  boost::shared_ptr<Pingu> c_pingu;
+  Pingu* c_pingu = 0;
 
   for (PinguIter pingu=pingus->begin(); pingu != pingus->end(); pingu++)
     {
@@ -216,7 +216,7 @@
 bool 
 Playfield::on_button_press(const CL_Key & /*key*/)
 {
-  if (current_pingu.get())
+  if (current_pingu)
     {
       char str[256];
       sprintf(str, "Pingu: %d:%s", current_pingu->get_id(), 

Index: Playfield.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Playfield.hh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Playfield.hh        7 Jun 2002 19:10:33 -0000       1.21
+++ Playfield.hh        8 Jun 2002 16:08:16 -0000       1.22
@@ -52,7 +52,7 @@
   std::vector<boost::shared_ptr<View> > view;
   
   ///int  x_offset, y_offset;
-  boost::shared_ptr<Pingu> current_pingu;
+  Pingu* current_pingu;
   bool mouse_scrolling;
   bool needs_clear_screen;
   int current_view;
@@ -93,7 +93,7 @@
   void process_input_interactive();
   void process_input_demomode();
   void set_world(World*);
-  boost::shared_ptr<Pingu> current_pingu_find(int x_pos, int y_pos);
+  Pingu* current_pingu_find(int x_pos, int y_pos);
 
   bool on_button_press(const CL_Key &key);
 

Index: PlayfieldView.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PlayfieldView.cc    7 Jun 2002 14:50:34 -0000       1.6
+++ PlayfieldView.cc    8 Jun 2002 16:08:16 -0000       1.7
@@ -52,7 +52,7 @@
   y_offset += (int) delta.y;
 }
 
-boost::shared_ptr<Pingu>
+Pingu*
 PlayfieldView::get_pingu (const CL_Vector& pos)
 {
   return world->get_pingu (CL_Vector(pos.x - x1 - x_offset,

Index: PlayfieldView.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/PlayfieldView.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PlayfieldView.hh    7 Jun 2002 14:50:34 -0000       1.5
+++ PlayfieldView.hh    8 Jun 2002 16:08:16 -0000       1.6
@@ -44,7 +44,7 @@
   void scroll (CL_Vector delta);
   
   // Return the pingu at the given *screen* coordinates
-  boost::shared_ptr<Pingu> get_pingu (const CL_Vector& pos);
+  Pingu* get_pingu (const CL_Vector& pos);
 };
 
 #endif

Index: Server.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Server.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Server.cc   7 Jun 2002 20:35:14 -0000       1.25
+++ Server.cc   8 Jun 2002 16:08:16 -0000       1.26
@@ -20,9 +20,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include <functional>
-#include <boost/smart_ptr.hpp>
-
-using namespace boost;
 
 #include "System.hh"
 #include "globals.hh"
@@ -34,6 +31,7 @@
 #include "PingusError.hh"
 #include "PLF.hh"
 #include "StringConverter.hh"
+#include "boost/smart_ptr.hpp"
 
 using namespace std;
 
@@ -120,7 +118,7 @@
 }
 
 /** PinguID search functor */
-struct PinguId : public unary_function<shared_ptr<Pingu>, bool>
+struct PinguId : public unary_function<Pingu*, bool>
 {
   int pingu_id;
 
@@ -129,7 +127,7 @@
     pingu_id = i;
   }
  
-  bool operator()(shared_ptr<Pingu> pingu) {
+  bool operator()(Pingu* pingu) {
     return (pingu->get_id() == pingu_id);
   }
 };
@@ -171,7 +169,7 @@
 
       if (pingu != pingus->end()) 
        {
-         shared_ptr<PinguAction> tmp_action = action_holder.get_action(action);
+         boost::shared_ptr<PinguAction> tmp_action = 
action_holder.get_action(action);
          
          if (tmp_action.get())
            {

Index: SmallMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/SmallMap.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- SmallMap.cc 1 Jun 2002 18:05:35 -0000       1.39
+++ SmallMap.cc 8 Jun 2002 16:08:16 -0000       1.40
@@ -198,8 +198,7 @@
   int y;
   PinguHolder* pingus = client->get_server()->get_world()->get_pingu_p();
 
-  for(std::list<boost::shared_ptr<Pingu> >::iterator i = pingus->begin();
-      i != pingus->end(); i++)
+  for(PinguIter i = pingus->begin(); i != pingus->end(); i++)
     {
       //FIXME: Replace this with put pixel
       x = x_pos + ((*i)->get_x() * width / 
client->get_server()->get_world()->get_colmap()->get_width());

Index: Trap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Trap.hh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Trap.hh     16 Dec 2001 03:23:44 -0000      1.20
+++ Trap.hh     8 Jun 2002 16:08:16 -0000       1.21
@@ -50,7 +50,7 @@
   
   // FIXME: catch_pingu() need not be public. now, it is only called
   // from update()
-  virtual void catch_pingu(boost::shared_ptr<Pingu>) =0;
+  virtual void catch_pingu(Pingu*) =0;
 };
 
 #endif

Index: View.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- View.cc     7 May 2002 08:49:23 -0000       1.16
+++ View.cc     8 Jun 2002 16:08:16 -0000       1.17
@@ -179,7 +179,7 @@
 }
 
 void 
-View::set_pingu(boost::shared_ptr<Pingu> p)
+View::set_pingu(Pingu* p)
 {
   current_pingu = p;
 }

Index: View.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/View.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- View.hh     12 Apr 2001 19:47:09 -0000      1.9
+++ View.hh     8 Jun 2002 16:08:16 -0000       1.10
@@ -39,7 +39,7 @@
   double size;              /// The zoom of the View, 1 is default
   CaptureRectangle cap;
   ///
-  boost::shared_ptr<Pingu> current_pingu;
+  Pingu* current_pingu;
   /// Static objects which are equal for all Views
   static World* world;
 
@@ -63,29 +63,18 @@
   //@}
 
   View(int, int, int, int, float s = 1.0);
-  ///
   ~View();
-  ///
+
   void draw();
-  ///
   bool is_over(int x, int y);
-  ///
   bool is_current();
-  ///
   int  get_x_offset() const;
-  ///
   int  get_y_offset() const;
-  ///
   int  get_x_pos() const;
-  ///
   int  get_y_pos() const; 
-  ///
   void set_x_offset(int);
-  ///
   void set_y_offset(int);
-  ///
   void shift_x_offset(int);
-  ///
   void shift_y_offset(int);
 
   /** Returns the current center of the screen in World coordinates. */
@@ -94,13 +83,9 @@
   int get_width () { return x2_pos - x1_pos; }
   int get_height () { return y2_pos - y1_pos; }
 
-  ///
   void set_zoom(double);
-  ///
   double get_zoom();
-  ///
-  void set_pingu(boost::shared_ptr<Pingu> p);
-  ///
+  void set_pingu(Pingu* p);
   static void set_world(World*);
 };
 

Index: World.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/World.cc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- World.cc    7 Jun 2002 19:10:33 -0000       1.68
+++ World.cc    8 Jun 2002 16:08:16 -0000       1.69
@@ -148,7 +148,7 @@
       
       if ((*pingu)->need_catch()) {
        for(PinguIter i = pingus->begin(); i != pingus->end(); i++) {
-         (*pingu)->catch_pingu(i->get());
+         (*pingu)->catch_pingu(*i);
        }
       }
     }
@@ -376,10 +376,10 @@
   view = v;
 }
 
-boost::shared_ptr<Pingu> 
+Pingu*
 World::get_pingu (const CL_Vector& pos)
 {
-  boost::shared_ptr<Pingu> current_pingu;
+  Pingu* current_pingu = 0;
   double distance = -1.0;
 
   for (PinguIter i = pingus->begin (); i != pingus->end (); ++i) {

Index: World.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/World.hh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- World.hh    7 Jun 2002 19:10:33 -0000       1.33
+++ World.hh    8 Jun 2002 16:08:16 -0000       1.34
@@ -53,7 +53,7 @@
 
   PinguMap* gfx_map;
   bool do_armageddon;
-  std::list<boost::shared_ptr<Pingu> >::iterator armageddon_count;
+  std::list<Pingu*>::iterator armageddon_count;
 
   unsigned int released_pingus;
   unsigned int allowed_pingus;
@@ -157,7 +157,7 @@
 
   /** @return the pingu at the given word coordinates, an empty
       shared_ptr is returned if none is there */
-  boost::shared_ptr<Pingu> get_pingu (const CL_Vector& pos);
+  Pingu* get_pingu (const CL_Vector& pos);
 };
 
 #endif

Index: WorldObj.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObj.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- WorldObj.cc 1 Jun 2002 18:05:35 -0000       1.20
+++ WorldObj.cc 8 Jun 2002 16:08:16 -0000       1.21
@@ -19,7 +19,6 @@
 //  02111-1307, USA. 
 
 #include <iostream>
-#include "boost/smart_ptr.hpp"
 
 #include "PingusError.hh"
 #include "worldobjs/Teleporter.hh"
@@ -27,8 +26,6 @@
 #include "worldobjs/ConveyorBelt.hh"
 #include "worldobjs/SwitchDoor.hh"
 #include "WorldObj.hh"
-
-using namespace boost;
 
 World* WorldObj::world;
 

Index: WorldObj.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/WorldObj.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- WorldObj.hh 15 Jan 2002 10:48:49 -0000      1.22
+++ WorldObj.hh 8 Jun 2002 16:08:16 -0000       1.23
@@ -20,8 +20,6 @@
 #ifndef WORLDOBJ_HH
 #define WORLDOBJ_HH
 
-#include "boost/smart_ptr.hpp"
-
 class World;
 class WorldObjData;