[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.37,1.38 PingusWorldMap.hh,1.21,1.22 PingusWorldMapGraph.cc,1.31,1.32 PingusWorldMapGraph.hh,1.20,1.21 PingusWorldMapManager.cc,1.21,1.22 PingusWorldMapManager.hh,1.8,1.9 PingusWorldMapNode.cc,1.2,1.3 PingusWorldMapStat.cc,1.5,1.6

[grumbel]

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

Modified Files:
        PingusWorldMap.cc PingusWorldMap.hh PingusWorldMapGraph.cc 
        PingusWorldMapGraph.hh PingusWorldMapManager.cc 
        PingusWorldMapManager.hh PingusWorldMapNode.cc 
        PingusWorldMapStat.cc 
Log Message:
some more namespace seperation

Index: PingusWorldMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMap.cc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- PingusWorldMap.cc   6 Jun 2002 09:34:28 -0000       1.37
+++ PingusWorldMap.cc   6 Jun 2002 14:05:44 -0000       1.38
@@ -34,7 +34,7 @@
 
 using namespace Pingus::WorldMap;
 
-PingusWorldMap::PingusWorldMap (std::string filename) :
+WorldMap::WorldMap (std::string filename) :
   font (PingusResource::load_font ("Fonts/pingus_small", "fonts")),
   green_dot ("worldmap/dot_green", "core"),
   red_dot ("worldmap/dot_red", "core"),
@@ -80,21 +80,21 @@
     }
 }
 
-PingusWorldMap::~PingusWorldMap ()
+WorldMap::~WorldMap ()
 {
   //delete graph;
   delete pingus;
 }
 
 void 
-PingusWorldMap::save ()
+WorldMap::save ()
 {
   std::cout << "PingusWorldMap:save()" << std::endl;
   stat->save (graph_data.nodes);
 }
 
 CL_Vector 
-PingusWorldMap::get_offset ()
+WorldMap::get_offset ()
 {
   // FIXME: Handling of background smaller than screen isn't handled
   assert (pingus);
@@ -132,7 +132,7 @@
 }
 
 void
-PingusWorldMap::init ()
+WorldMap::init ()
 {
   std::cout << "PingusWorldMap::init" << std::endl;
   if (!graph_data.get_music ().empty ())
@@ -140,19 +140,19 @@
 }
 
 void 
-PingusWorldMap::disable_button_events ()
+WorldMap::disable_button_events ()
 {
   catch_input = false;
 }
   
 void 
-PingusWorldMap::enable_button_events ()
+WorldMap::enable_button_events ()
 {
   catch_input = true;
 }
 
 void 
-PingusWorldMap::on_button_press (CL_InputDevice *device, const CL_Key &key)
+WorldMap::on_button_press (CL_InputDevice *device, const CL_Key &key)
 {
   if (!catch_input) return;
 
@@ -254,19 +254,19 @@
 }
  
 void 
-PingusWorldMap::on_button_release (CL_InputDevice * /*device*/, const CL_Key & 
/*key*/)
+WorldMap::on_button_release (CL_InputDevice * /*device*/, const CL_Key & 
/*key*/)
 {
   if (!catch_input) return;
 }
 
 void
-PingusWorldMap::start_level (Pingus::WorldMap::Node* /*node*/)
+WorldMap::start_level (Pingus::WorldMap::Node* /*node*/)
 {
 
 }
 
 void
-PingusWorldMap::draw ()
+WorldMap::draw ()
 {
   CL_Vector offset = get_offset ();
   
@@ -322,13 +322,13 @@
 }
 
 void
-PingusWorldMap::update (float delta)
+WorldMap::update (float delta)
 {
   pingus->update (delta);
 }
 
 boost::shared_ptr<Pingus::WorldMap::Node>
-PingusWorldMap::get_node (int x, int y)
+WorldMap::get_node (int x, int y)
 {
   for (GraphIter i = graph_data.nodes.begin ();
        i != graph_data.nodes.end ();
@@ -349,7 +349,7 @@
 }
 
 void 
-PingusWorldMap::set_pingus (int node_id)
+WorldMap::set_pingus (int node_id)
 {
   for (GraphIter i = graph_data.nodes.begin ();
        i != graph_data.nodes.end ();

Index: PingusWorldMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMap.hh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- PingusWorldMap.hh   6 Jun 2002 09:34:28 -0000       1.21
+++ PingusWorldMap.hh   6 Jun 2002 14:05:44 -0000       1.22
@@ -28,88 +28,96 @@
 #include "PingusWorldMapPingus.hh"
 #include "PingusWorldMapStat.hh"
 
-/** A class for loading, displaying and managing the worldmap. */
-class PingusWorldMap
+namespace Pingus
 {
-private:
-  CL_Surface background;
-  CL_Font*   font;
+  namespace WorldMap
+  {
 
-  Sprite green_dot;
-  Sprite red_dot;
-  Sprite dot_border;
-  Sprite green_flag; 
+    /** A class for loading, displaying and managing the worldmap. */
+    class WorldMap
+    {
+    private:
+      CL_Surface background;
+      CL_Font*   font;
 
-  //Graph<PingusWorldMapNode>* graph;
-  PingusWorldMapGraph graph_data;
-  typedef PingusWorldMapGraph::iterator GraphIter;
+      Sprite green_dot;
+      Sprite red_dot;
+      Sprite dot_border;
+      Sprite green_flag; 
 
-  PingusWorldMapPingus* pingus;
+      //Graph<PingusWorldMapNode>* graph;
+      Graph graph_data;
+      typedef Graph::iterator GraphIter;
+
+      PingusWorldMapPingus* pingus;
   
-  bool catch_input;
+      bool catch_input;
 
-  bool do_quit;
-  boost::shared_ptr<Pingus::WorldMap::Node> last_node;
-  typedef boost::shared_ptr<Pingus::WorldMap::Node> NodePtr;
-  unsigned int last_node_time;
+      bool do_quit;
+      boost::shared_ptr<Pingus::WorldMap::Node> last_node;
+      typedef boost::shared_ptr<Pingus::WorldMap::Node> NodePtr;
+      unsigned int last_node_time;
   
-  boost::shared_ptr<PingusWorldMapStat> stat;
-public:
-  /** Load a worldmap from a given worldmap description file */
-  PingusWorldMap (std::string filename);
+      boost::shared_ptr<PingusWorldMapStat> stat;
+    public:
+      /** Load a worldmap from a given worldmap description file */
+      WorldMap (std::string filename);
 
-  /** Destruct the worldmap */
-  virtual ~PingusWorldMap ();
+      /** Destruct the worldmap */
+      virtual ~WorldMap ();
 
-  /** Launch the level at the given node
-      @param node The current node from which the level should be started */
-  void start_level (Pingus::WorldMap::Node* node);
+      /** Launch the level at the given node
+         @param node The current node from which the level should be started */
+      void start_level (Pingus::WorldMap::Node* node);
 
-  /** Start up the music and other things that need only to me run
-      once on startup of a new WorldMap */
-  void init ();
+      /** Start up the music and other things that need only to me run
+         once on startup of a new WorldMap */
+      void init ();
 
-  /** Save the current status to a file */
-  void save ();
+      /** Save the current status to a file */
+      void save ();
   
-  /** React on button press:
-      - calculate which level was clicked
-      - calculate the shortest path
-      - let the pingu walk */
-  void on_button_press (CL_InputDevice *device, const CL_Key &key);
+      /** React on button press:
+         - calculate which level was clicked
+         - calculate the shortest path
+         - let the pingu walk */
+      void on_button_press (CL_InputDevice *device, const CL_Key &key);
  
-  /** React on button release */
-  void on_button_release (CL_InputDevice *device, const CL_Key &key);
+      /** React on button release */
+      void on_button_release (CL_InputDevice *device, const CL_Key &key);
 
-  /** Disable all event catching */
-  void disable_button_events ();
+      /** Disable all event catching */
+      void disable_button_events ();
   
-  /** Enable all event catching */
-  void enable_button_events ();
+      /** Enable all event catching */
+      void enable_button_events ();
   
-  /** Draw the world worldmap */
-  virtual void draw ();
+      /** Draw the world worldmap */
+      virtual void draw ();
   
-  /** Returns true if the worldmap is finished and the
-      PingusWorldMapManager can quit */
-  bool do_exit () { return do_quit; }
+      /** Returns true if the worldmap is finished and the
+         PingusWorldMapManager can quit */
+      bool do_exit () { return do_quit; }
 
-  /** Let the woldmap do some stuff, like animating smoke, playing
-      sounds or reacting on special events */
-  virtual void update (float delta);
+      /** Let the woldmap do some stuff, like animating smoke, playing
+         sounds or reacting on special events */
+      virtual void update (float delta);
 
-  /** Returns a pointer to the node under the given coordinates */
-  NodePtr get_node (int x, int y);
+      /** Returns a pointer to the node under the given coordinates */
+      NodePtr get_node (int x, int y);
   
-  /** Callculate the offset which is used for drawing and collision
-      detection. The offset will be used for scrolling when the
-      background is larger than the screen. 
-      @return the currently used draw offset */
-  CL_Vector get_offset ();
+      /** Callculate the offset which is used for drawing and collision
+         detection. The offset will be used for scrolling when the
+         background is larger than the screen. 
+         @return the currently used draw offset */
+      CL_Vector get_offset ();
 
-  /** Set the pingu to the given node with 'id' */
-  void set_pingus (int node_id);
-};
+      /** Set the pingu to the given node with 'id' */
+      void set_pingus (int node_id);
+    };
+
+  }
+}
 
 #endif
 

Index: PingusWorldMapGraph.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapGraph.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- PingusWorldMapGraph.cc      6 Jun 2002 09:34:28 -0000       1.31
+++ PingusWorldMapGraph.cc      6 Jun 2002 14:05:44 -0000       1.32
@@ -37,24 +37,24 @@
 
 using namespace Pingus::WorldMap;
 
-PingusWorldMapGraph::PingusWorldMapGraph ()
+Graph::Graph ()
 {
   music = "pingus-1.it";
   //graph = 0;
 }
 
-PingusWorldMapGraph::~PingusWorldMapGraph ()
+Graph::~Graph ()
 {
   //llif (graph) delete graph;
 }
  
 void
-PingusWorldMapGraph::parse_file (std::string filename)
+Graph::parse_file (std::string filename)
 {
   doc = xmlParseFile(filename.c_str());
 
   if (!doc) {
-    throw PingusError (_("PingusWorldMapGraph: File not found: ") + filename);
+    throw PingusError (_("Graph: File not found: ") + filename);
   }    
 
   xmlNodePtr cur = doc->ROOT;
@@ -85,7 +85,7 @@
            }
          else
            {
-             printf("PingusWorldMapGraph: Unhandled: %s\n", (char*)cur->name);
+             printf("Graph: Unhandled: %s\n", (char*)cur->name);
            }
          cur = cur->next;
        }      
@@ -95,7 +95,7 @@
 }
 
 void
-PingusWorldMapGraph::parse_node_list (xmlNodePtr cur)
+Graph::parse_node_list (xmlNodePtr cur)
 {
   cur = cur->children;
   while (cur != NULL)
@@ -129,20 +129,20 @@
        }
       else
        {
-         printf("PingusWorldMapGraph:parse_node_list: Unhandled: %s\n", 
(char*)cur->name);       
+         printf("Graph:parse_node_list: Unhandled: %s\n", (char*)cur->name);   
  
        }
       cur = cur->next;
     } 
 }
 
 void
-PingusWorldMapGraph::parse_background (xmlNodePtr cur)
+Graph::parse_background (xmlNodePtr cur)
 {
   bg_desc = XMLhelper::parse_surface(doc, cur);
 }
 
 void
-PingusWorldMapGraph::parse_music (xmlNodePtr cur)
+Graph::parse_music (xmlNodePtr cur)
 {
   char* file = (char*)xmlGetProp(cur, (xmlChar*)"file");
 
@@ -150,30 +150,30 @@
     music = file;
   else
     {
-      std::cout << "PingusWorldMapGraph: No music file given" << std::endl;
+      std::cout << "Graph: No music file given" << std::endl;
     }
 }
 
 ResDescriptor 
-PingusWorldMapGraph::get_background ()
+Graph::get_background ()
 {
   return bg_desc;
 }
 
 std::string 
-PingusWorldMapGraph::get_music ()
+Graph::get_music ()
 {
   return music;
 }
 
 /*Graph<PingusWorldMapNode>* 
-  PingusWorldMapGraph::get_graph ()
+  Graph::get_graph ()
   {
   return graph;
   }*/
 
 void
-PingusWorldMapGraph::draw (const CL_Vector& offset)
+Graph::draw (const CL_Vector& offset)
 {
   //float x_scale = CL_Display::get_width () / 800.0;
   //float y_scale = CL_Display::get_height () / 600.0;

Index: PingusWorldMapGraph.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapGraph.hh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PingusWorldMapGraph.hh      6 Jun 2002 09:34:28 -0000       1.20
+++ PingusWorldMapGraph.hh      6 Jun 2002 14:05:44 -0000       1.21
@@ -29,36 +29,43 @@
 #include "../XMLhelper.hh"
 #include "PingusWorldMapNode.hh"
 
-class PingusWorldMapGraph
+namespace Pingus
 {
-private:
-  //Graph<Node>* graph;
-  ResDescriptor bg_desc;
-  std::string music;
-  xmlDocPtr doc;
+  namespace WorldMap
+  {
+
+    class Graph
+    {
+    private:
+      //Graph<Node>* graph;
+      ResDescriptor bg_desc;
+      std::string music;
+      xmlDocPtr doc;
   
-public:
-  std::list<boost::shared_ptr<Pingus::WorldMap::Node> >   nodes;
-  typedef std::list<boost::shared_ptr<Pingus::WorldMap::Node> >::iterator 
iterator;
+    public:
+      std::list<boost::shared_ptr<Pingus::WorldMap::Node> >   nodes;
+      typedef std::list<boost::shared_ptr<Pingus::WorldMap::Node> >::iterator 
iterator;
 
-  PingusWorldMapGraph ();
-  ~PingusWorldMapGraph ();
+      Graph ();
+      ~Graph ();
  
-  ResDescriptor              get_background ();
-  //Graph<Node>* get_graph ();
-  std::string get_music ();
+      ResDescriptor              get_background ();
+      //Graph<Node>* get_graph ();
+      std::string get_music ();
   
-  void draw (const CL_Vector&);
+      void draw (const CL_Vector&);
 
-  /// Some functions to parse the data out of an xml file
-  //@{ 
-  void parse_file (std::string filename);
-private:
-  void parse_node_list (xmlNodePtr);
-  void parse_music (xmlNodePtr);
-  void parse_background (xmlNodePtr);
-  //@}
-};
+      /// Some functions to parse the data out of an xml file
+      //@{ 
+      void parse_file (std::string filename);
+    private:
+      void parse_node_list (xmlNodePtr);
+      void parse_music (xmlNodePtr);
+      void parse_background (xmlNodePtr);
+      //@}
+    };
+  }
+}
 
 #endif
 

Index: PingusWorldMapManager.cc
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapManager.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- PingusWorldMapManager.cc    1 Jun 2002 18:05:37 -0000       1.21
+++ PingusWorldMapManager.cc    6 Jun 2002 14:05:44 -0000       1.22
@@ -24,20 +24,23 @@
 #include "../Display.hh"
 #include "PingusWorldMapManager.hh"
 
-PingusWorldMapManager* PingusWorldMapManager::current_manager;
+using namespace Pingus;
+using namespace Pingus::WorldMap;
 
-PingusWorldMapManager::PingusWorldMapManager ()
+WorldMapManager* WorldMapManager::current_manager;
+
+WorldMapManager::WorldMapManager ()
 {
   current_manager = this;
   is_init = false;
 }
 
-PingusWorldMapManager::~PingusWorldMapManager ()
+WorldMapManager::~WorldMapManager ()
 {
 }
 
 void 
-PingusWorldMapManager::init ()
+WorldMapManager::init ()
 {
   if (!is_init)
     {
@@ -47,16 +50,16 @@
 }
 
 void
-PingusWorldMapManager::display ()
+WorldMapManager::display ()
 {
-  on_button_press_slot   = CL_Input::sig_button_press ().connect (this, 
&PingusWorldMapManager::on_button_press);
-  on_button_release_slot = CL_Input::sig_button_release ().connect (this, 
&PingusWorldMapManager::on_button_release);
-  on_mouse_move_slot     = CL_Input::sig_mouse_move ().connect (this, 
&PingusWorldMapManager::on_mouse_move);
+  on_button_press_slot   = CL_Input::sig_button_press ().connect (this, 
&WorldMapManager::on_button_press);
+  on_button_release_slot = CL_Input::sig_button_release ().connect (this, 
&WorldMapManager::on_button_release);
+  on_mouse_move_slot     = CL_Input::sig_mouse_move ().connect (this, 
&WorldMapManager::on_mouse_move);
 
   init ();
 
-  worldmap = boost::shared_ptr<PingusWorldMap>
-    (new PingusWorldMap (path_manager.complete("worldmaps/volcano.xml")));
+  worldmap = boost::shared_ptr<WorldMap::WorldMap>
+    (new WorldMap::WorldMap (path_manager.complete("worldmaps/volcano.xml")));
 
   worldmap->init ();
 
@@ -70,7 +73,7 @@
       if (new_worldmap.get ())
        {
          worldmap = new_worldmap;
-         new_worldmap = boost::shared_ptr<PingusWorldMap>();
+         new_worldmap = boost::shared_ptr<WorldMap::WorldMap>();
        }
 
       CL_System::sleep (20);
@@ -84,34 +87,34 @@
 }
 
 void
-PingusWorldMapManager::on_mouse_move (CL_InputDevice *, int /*mouse_x*/, int 
/*mouse_y*/)
+WorldMapManager::on_mouse_move (CL_InputDevice *, int /*mouse_x*/, int 
/*mouse_y*/)
 {
   //  std::cout << "mouse: " << mouse_x << " " << mouse_y << std::endl;  
 }
 
 void 
-PingusWorldMapManager::on_button_press (CL_InputDevice *device, const CL_Key 
&key)
+WorldMapManager::on_button_press (CL_InputDevice *device, const CL_Key &key)
 {
   worldmap->on_button_press (device, key);
 }
 
 void 
-PingusWorldMapManager::on_button_release (CL_InputDevice * /*device*/, const 
CL_Key & /*key*/)
+WorldMapManager::on_button_release (CL_InputDevice * /*device*/, const CL_Key 
& /*key*/)
 {
   //  std::cout << "key release: " << key.id << std::endl;
 }
 
 void
-PingusWorldMapManager::on_resize(int w, int h)
+WorldMapManager::on_resize(int w, int h)
 {
   std::cout << "Width: " << w << " Height: " << h << std::endl;
 }
 
 void 
-PingusWorldMapManager::change_map (std::string filename, int node)
+WorldMapManager::change_map (std::string filename, int node)
 {
-  new_worldmap = boost::shared_ptr<PingusWorldMap>
-    (new PingusWorldMap (path_manager.complete("worldmaps/" + filename)));
+  new_worldmap = boost::shared_ptr<WorldMap::WorldMap>
+    (new WorldMap::WorldMap (path_manager.complete("worldmaps/" + filename)));
   new_worldmap->set_pingus (node);
 }
 

Index: PingusWorldMapManager.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapManager.hh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PingusWorldMapManager.hh    2 Jun 2002 21:09:11 -0000       1.8
+++ PingusWorldMapManager.hh    6 Jun 2002 14:05:44 -0000       1.9
@@ -22,48 +22,52 @@
 
 #include "PingusWorldMap.hh"
 
-/**  */
-class PingusWorldMapManager
+namespace Pingus
 {
-private:
-  bool is_init;
-  bool exit_worldmap;
-  boost::shared_ptr<PingusWorldMap> worldmap;
-  boost::shared_ptr<PingusWorldMap> new_worldmap;
+  /**  */
+  class WorldMapManager
+  {
+  private:
+    bool is_init;
+    bool exit_worldmap;
+    boost::shared_ptr<WorldMap::WorldMap> worldmap;
+    boost::shared_ptr<WorldMap::WorldMap> new_worldmap;
 
-  /// Some slots to manage the event handling
-  //@{
-  CL_Slot on_button_press_slot;
-  CL_Slot on_button_release_slot;
-  CL_Slot on_mouse_move_slot;
-  CL_Slot on_resize_slot;
-  //@}
+    /// Some slots to manage the event handling
+    //@{
+    CL_Slot on_button_press_slot;
+    CL_Slot on_button_release_slot;
+    CL_Slot on_mouse_move_slot;
+    CL_Slot on_resize_slot;
+    //@}
 
-  static PingusWorldMapManager* current_manager;
+    static WorldMapManager* current_manager;
 
-public:
-  PingusWorldMapManager ();
-  ~PingusWorldMapManager ();
+  public:
+    WorldMapManager ();
+    ~WorldMapManager ();
   
-private:
-  /// Load all required resources if not already done
-  void init ();
-  ///
-  void on_button_press (CL_InputDevice *device, const CL_Key &key);
-  ///
-  void on_button_release (CL_InputDevice *device, const CL_Key &key);
-  ///
-  void on_mouse_move(CL_InputDevice *,int mouse_x, int mouse_y);
-  ///
-  void on_resize(int w, int h);
+  private:
+    /// Load all required resources if not already done
+    void init ();
+    ///
+    void on_button_press (CL_InputDevice *device, const CL_Key &key);
+    ///
+    void on_button_release (CL_InputDevice *device, const CL_Key &key);
+    ///
+    void on_mouse_move(CL_InputDevice *,int mouse_x, int mouse_y);
+    ///
+    void on_resize(int w, int h);
 
-public:
-  /// Display the worldmap and let the user select a level
-  void display ();
-  void change_map (std::string filename, int node);
+  public:
+    /// Display the worldmap and let the user select a level
+    void display ();
+    void change_map (std::string filename, int node);
 
-  static PingusWorldMapManager* get_current () { return current_manager; } 
-};
+    static WorldMapManager* get_current () { return current_manager; } 
+  };
+
+}
 
 #endif
 

Index: PingusWorldMapNode.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapNode.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PingusWorldMapNode.cc       6 Jun 2002 09:34:28 -0000       1.2
+++ PingusWorldMapNode.cc       6 Jun 2002 14:05:44 -0000       1.3
@@ -43,7 +43,7 @@
 TubeNode::on_click ()
 {
   std::cout << "Not Supported" << std::endl;
-  PingusWorldMapManager::get_current ()->change_map (worldmap_name, link_node);
+  WorldMapManager::get_current ()->change_map (worldmap_name, link_node);
 }
 
 void 

Index: PingusWorldMapStat.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapStat.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PingusWorldMapStat.cc       6 Jun 2002 09:34:28 -0000       1.5
+++ PingusWorldMapStat.cc       6 Jun 2002 14:05:44 -0000       1.6
@@ -148,7 +148,7 @@
   else
     {
       out << "<pingus-worldmap-stat>" << std::endl;
-      for (PingusWorldMapGraph::iterator i = nodes.begin ();
+      for (Graph::iterator i = nodes.begin ();
           i != nodes.end (); ++i)
        {
          LevelNode* node = dynamic_cast<LevelNode*>((*i).get ());