[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.21,1.22 manager.hxx,1.15,1.16 pingus.cxx,1.24,1.25 pingus.hxx,1.21,1.22

[torangan]

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

Modified Files:
        manager.cxx manager.hxx pingus.cxx pingus.hxx 
Log Message:
removed the last usages of boost::shared_ptr and boost/


Index: manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- manager.cxx 27 Nov 2002 20:05:42 -0000      1.21
+++ manager.cxx 25 Jan 2003 18:34:36 -0000      1.22
@@ -33,8 +33,7 @@
   exit_worldmap = false;
 
   // FIXME: The default startup map should be configurable by some file
-  worldmap = boost::shared_ptr<WorldMap>
-    (new WorldMap (path_manager.complete("worldmaps/tutorial.xml")));
+  worldmap = new WorldMap (path_manager.complete("worldmaps/tutorial.xml"));
 
   //worldmap->on_startup ();
 
@@ -52,6 +51,8 @@
 
 WorldMapManager::~WorldMapManager ()
 {
+  delete worldmap;
+  delete new_worldmap;
 }
 
 void
@@ -69,17 +70,17 @@
     ScreenManager::instance ()->pop_screen ();
 
   // Check if new worldmap is set and if so, change it
-  if (new_worldmap.get ())
+  if (new_worldmap)
     {
-      worldmap = new_worldmap;
-      new_worldmap = boost::shared_ptr<WorldMap>();
+      worldmap     = new_worldmap;
+      new_worldmap = 0;
     }
 }
 
 void
 WorldMapManager::WorldMapComponent::draw (GraphicContext& gc)
 {
-  WorldMapManager::instance ()->worldmap->draw (gc);
+  WorldMapManager::instance()->worldmap->draw(gc);
 }
 
 void
@@ -116,8 +117,7 @@
 WorldMapManager::change_map (const std::string& filename, NodeId node)
 {
   // Create the new worldmap and make it the current one
-  new_worldmap = boost::shared_ptr<WorldMap>
-    (new WorldMap (path_manager.complete("worldmaps/" + filename)));
+  new_worldmap = new WorldMap (path_manager.complete("worldmaps/" + filename));
   new_worldmap->set_pingus (node);
 }
 

Index: manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- manager.hxx 27 Nov 2002 20:05:42 -0000      1.15
+++ manager.hxx 25 Jan 2003 18:34:36 -0000      1.16
@@ -23,7 +23,6 @@
 #include <string>
 #include <ClanLib/Signals/slot.h>
 #include "../gui/gui_manager.hxx"
-#include "../boost/smart_ptr.hpp"
 #include "../gui_screen.hxx"
 
 class CL_InputDevice;
@@ -33,6 +32,7 @@
 namespace WorldMapNS {
 
 typedef int NodeId;
+
 class WorldMap;
 
 /** The WorldMapManager manages the worldmaps and the translation
@@ -69,8 +69,8 @@
 
   bool is_init;
   bool exit_worldmap;
-  boost::shared_ptr<WorldMap> worldmap;
-  boost::shared_ptr<WorldMap> new_worldmap;
+  WorldMap* worldmap;
+  WorldMap* new_worldmap;
 
   WorldMapManager ();
 public:
@@ -114,6 +114,3 @@
 #endif
 
 /* EOF */
-
-
-

Index: pingus.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pingus.cxx  26 Nov 2002 21:30:37 -0000      1.24
+++ pingus.cxx  25 Jan 2003 18:34:36 -0000      1.25
@@ -19,7 +19,6 @@
 
 #include <iostream>
 #include <math.h>
-#include "../boost/smart_ptr.hpp"
 #include "../graphic_context.hxx"
 #include "dot.hxx"
 #include "../math.hxx"

Index: pingus.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.hxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pingus.hxx  20 Dec 2002 20:45:50 -0000      1.21
+++ pingus.hxx  25 Jan 2003 18:34:36 -0000      1.22
@@ -25,10 +25,6 @@
 #include "drawable.hxx"
 #include "path_graph.hxx"
 
-namespace boost {
-  template <class T> class shared_ptr;
-}
-
 namespace WorldMapNS {
 
 /** This is the representation of the horde of Pingus which will walk