[Pingus-CVS] CVS: Games/Pingus/src/worldmap PingusWorldMap.cc,1.39,1.40 PingusWorldMap.hh,1.25,1.26 PingusWorldMapGraph.cc,1.33,1.34 PingusWorldMapManager.cc,1.23,1.24 PingusWorldMapManager.hh,1.10,1.11 PingusWorldMapNode.hh,1.3,1.4 PingusWorldMapNodeData.cc,1.4,1.5 PingusWorldMapNodeData.hh,1.3,1.4 PingusWorldMapStat.cc,1.6,1.7

[torangan]

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

Modified Files:
        PingusWorldMap.cc PingusWorldMap.hh PingusWorldMapGraph.cc 
        PingusWorldMapManager.cc PingusWorldMapManager.hh 
        PingusWorldMapNode.hh PingusWorldMapNodeData.cc 
        PingusWorldMapNodeData.hh PingusWorldMapStat.cc 
Log Message:
replaced ClanLib/core.h and ClanLib/display.h with the really required headers


Index: PingusWorldMap.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMap.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- PingusWorldMap.cc   6 Jun 2002 16:24:50 -0000       1.39
+++ PingusWorldMap.cc   10 Jun 2002 11:00:28 -0000      1.40
@@ -17,6 +17,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <ClanLib/Core/System/system.h>
+#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/Input/input.h>
+#include <ClanLib/Display/Input/keyboard.h>
+#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/Input/mouse.h>
 #include "../PathManager.hh"
 #include "../PingusError.hh"
 #include "../System.hh"

Index: PingusWorldMap.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMap.hh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- PingusWorldMap.hh   8 Jun 2002 23:11:09 -0000       1.25
+++ PingusWorldMap.hh   10 Jun 2002 11:00:28 -0000      1.26
@@ -21,9 +21,12 @@
 #define PINGUSWORLDMAP_HH
 
 #include <string>
-//#include "../generic/Graph.hh"
 #include "PingusWorldMapPingus.hh"
 #include "PingusWorldMapStat.hh"
+
+class CL_Key;
+class CL_Font;
+class CL_InputDevice;
 
 namespace Pingus
 {

Index: PingusWorldMapGraph.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapGraph.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- PingusWorldMapGraph.cc      8 Jun 2002 23:11:09 -0000       1.33
+++ PingusWorldMapGraph.cc      10 Jun 2002 11:00:28 -0000      1.34
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <ClanLib/Display/Display/display.h>
 #include "../System.hh"
 #include "../my_gettext.hh"
 #include "../PingusError.hh"

Index: PingusWorldMapManager.cc
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapManager.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- PingusWorldMapManager.cc    6 Jun 2002 16:24:50 -0000       1.23
+++ PingusWorldMapManager.cc    10 Jun 2002 11:00:28 -0000      1.24
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <ClanLib/Display/Input/input.h>
 #include "../PathManager.hh"
 #include "../DeltaManager.hh"
 #include "../globals.hh"

Index: PingusWorldMapManager.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapManager.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PingusWorldMapManager.hh    6 Jun 2002 16:24:50 -0000       1.10
+++ PingusWorldMapManager.hh    10 Jun 2002 11:00:28 -0000      1.11
@@ -20,7 +20,7 @@
 #ifndef PINGUSWORLDMAPMANAGER_HH
 #define PINGUSWORLDMAPMANAGER_HH
 
-#include <ClanLib/core.h>
+#include <ClanLib/Signals/slot.h>
 #include "../boost/smart_ptr.hpp"
 
 class CL_InputDevice;
@@ -78,3 +78,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: PingusWorldMapNode.hh
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapNode.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PingusWorldMapNode.hh       8 Jun 2002 16:36:20 -0000       1.3
+++ PingusWorldMapNode.hh       10 Jun 2002 11:00:29 -0000      1.4
@@ -27,7 +27,6 @@
 #include "../PLF.hh"
 #include "PingusWorldMapNodeData.hh"
 
-//#include "../generic/Graph.hh"
 namespace Pingus
 {
   namespace WorldMap

Index: PingusWorldMapNodeData.cc
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapNodeData.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PingusWorldMapNodeData.cc   8 Jun 2002 23:11:09 -0000       1.4
+++ PingusWorldMapNodeData.cc   10 Jun 2002 11:00:29 -0000      1.5
@@ -191,7 +191,7 @@
 }
 
 NodeData* 
-EmptyNodeData::create(xmlDocPtr doc, xmlNodePtr cur)
+EmptyNodeData::create(xmlDocPtr /*doc*/, xmlNodePtr /*cur*/)
 {
   return new EmptyNodeData ();
 }

Index: PingusWorldMapNodeData.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapNodeData.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PingusWorldMapNodeData.hh   8 Jun 2002 20:19:55 -0000       1.3
+++ PingusWorldMapNodeData.hh   10 Jun 2002 11:00:29 -0000      1.4
@@ -22,7 +22,6 @@
 
 #include <list>
 #include <string>
-#include <ClanLib/core.h>
 
 class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
 class _xmlNode; typedef _xmlNode* xmlNodePtr;
@@ -143,3 +142,6 @@
 #endif
 
 /* EOF */
+
+
+

Index: PingusWorldMapStat.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/PingusWorldMapStat.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PingusWorldMapStat.cc       6 Jun 2002 14:05:44 -0000       1.6
+++ PingusWorldMapStat.cc       10 Jun 2002 11:00:29 -0000      1.7
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <fstream>
 #include <iostream>
 #include "../System.hh"
 #include "../StringConverter.hh"