[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.38,1.39 PingusWorldMap.hh,1.22,1.23 PingusWorldMapManager.cc,1.22,1.23 PingusWorldMapManager.hh,1.9,1.10

[grumbel]

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

Modified Files:
        PingusWorldMap.cc PingusWorldMap.hh PingusWorldMapManager.cc 
        PingusWorldMapManager.hh 
Log Message:
Removed some include dependencies

Index: PingusWorldMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMap.cc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- PingusWorldMap.cc   6 Jun 2002 14:05:44 -0000       1.38
+++ PingusWorldMap.cc   6 Jun 2002 16:24:50 -0000       1.39
@@ -363,4 +363,10 @@
     }
 }
 
+bool
+WorldMap::do_exit () 
+{
+  return do_quit; 
+}
+
 /* EOF */

Index: PingusWorldMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMap.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PingusWorldMap.hh   6 Jun 2002 14:05:44 -0000       1.22
+++ PingusWorldMap.hh   6 Jun 2002 16:24:50 -0000       1.23
@@ -64,7 +64,7 @@
       WorldMap (std::string filename);
 
       /** Destruct the worldmap */
-      virtual ~WorldMap ();
+      ~WorldMap ();
 
       /** Launch the level at the given node
          @param node The current node from which the level should be started */
@@ -93,15 +93,15 @@
       void enable_button_events ();
   
       /** Draw the world worldmap */
-      virtual void draw ();
+      void draw ();
   
       /** Returns true if the worldmap is finished and the
          PingusWorldMapManager can quit */
-      bool do_exit () { return do_quit; }
+      bool do_exit ();
 
       /** Let the woldmap do some stuff, like animating smoke, playing
          sounds or reacting on special events */
-      virtual void update (float delta);
+      void update (float delta);
 
       /** Returns a pointer to the node under the given coordinates */
       NodePtr get_node (int x, int y);

Index: PingusWorldMapManager.cc
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapManager.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- PingusWorldMapManager.cc    6 Jun 2002 14:05:44 -0000       1.22
+++ PingusWorldMapManager.cc    6 Jun 2002 16:24:50 -0000       1.23
@@ -22,6 +22,7 @@
 #include "../globals.hh"
 #include "../algo.hh"
 #include "../Display.hh"
+#include "PingusWorldMap.hh"
 #include "PingusWorldMapManager.hh"
 
 using namespace Pingus;

Index: PingusWorldMapManager.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapManager.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PingusWorldMapManager.hh    6 Jun 2002 14:05:44 -0000       1.9
+++ PingusWorldMapManager.hh    6 Jun 2002 16:24:50 -0000       1.10
@@ -20,10 +20,19 @@
 #ifndef PINGUSWORLDMAPMANAGER_HH
 #define PINGUSWORLDMAPMANAGER_HH
 
-#include "PingusWorldMap.hh"
+#include <ClanLib/core.h>
+#include "../boost/smart_ptr.hpp"
+
+class CL_InputDevice;
+class CL_Key;
 
 namespace Pingus
 {
+  namespace WorldMap
+  {
+    class WorldMap;
+  }
+
   /**  */
   class WorldMapManager
   {
@@ -50,13 +59,10 @@
   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: