[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.13,1.14

[grumbel]

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

Modified Files:
        manager.cxx 
Log Message:
- win32 fixes
- added fadeouts

Index: manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- manager.cxx 28 Sep 2002 11:52:26 -0000      1.13
+++ manager.cxx 28 Sep 2002 22:24:24 -0000      1.14
@@ -25,7 +25,7 @@
 
 namespace WorldMapNS {
 
-WorldMapManager* WorldMapManager::instance_(0);
+WorldMapManager* WorldMapManager::instance_ = 0;
 
 WorldMapManager::WorldMapManager ()
 {
@@ -33,8 +33,8 @@
   exit_worldmap = false;
 
   // FIXME: The default startup map should be configurable by some file
-  worldmap = boost::shared_ptr<WorldMap::WorldMap>
-    (new WorldMap::WorldMap (path_manager.complete("worldmaps/volcano.xml")));
+  worldmap = boost::shared_ptr<WorldMap>
+    (new WorldMap (path_manager.complete("worldmaps/volcano.xml")));
 
   worldmap->on_startup ();
 
@@ -72,7 +72,7 @@
   if (new_worldmap.get ())
     {
       worldmap = new_worldmap;
-      new_worldmap = boost::shared_ptr<WorldMap::WorldMap>();
+      new_worldmap = boost::shared_ptr<WorldMap>();
     }
 }
 
@@ -99,8 +99,8 @@
 WorldMapManager::change_map (const std::string& filename, int node)
 {
   // Create the new worldmap and make it the current one
-  new_worldmap = boost::shared_ptr<WorldMap::WorldMap>
-    (new WorldMap::WorldMap (path_manager.complete("worldmaps/" + filename)));
+  new_worldmap = boost::shared_ptr<WorldMap>
+    (new WorldMap (path_manager.complete("worldmaps/" + filename)));
   new_worldmap->set_pingus (node);
 }