[Pingus-CVS] CVS: Games/Pingus/src/worldmap dot_factory.cxx, 1.4, 1.5 drawable_factory.hxx, 1.2, 1.3 level_dot.cxx, 1.24, 1.25 level_dot.hxx, 1.10, 1.11 manager.cxx, 1.39, 1.40 path_graph.cxx, 1.22, 1.23 path_graph.hxx, 1.11, 1.12 pingus.hxx, 1.26, 1.27 sprite_drawable.hxx, 1.3, 1.4 surface_drawable.hxx, 1.6, 1.7 worldmap.hxx, 1.29, 1.30

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv7605/worldmap

Modified Files:
        dot_factory.cxx drawable_factory.hxx level_dot.cxx 
        level_dot.hxx manager.cxx path_graph.cxx path_graph.hxx 
        pingus.hxx sprite_drawable.hxx surface_drawable.hxx 
        worldmap.hxx 
Log Message:
misc stuff

Index: dot_factory.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/dot_factory.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dot_factory.cxx     19 Apr 2003 10:23:19 -0000      1.4
+++ dot_factory.cxx     20 Oct 2003 19:28:55 -0000      1.5
@@ -22,6 +22,7 @@
 #include "level_dot.hxx"
 #include "dot_factory.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 Dot*
@@ -44,5 +45,6 @@
 }
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 /* EOF */

Index: drawable_factory.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/drawable_factory.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drawable_factory.hxx        19 Apr 2003 10:23:19 -0000      1.2
+++ drawable_factory.hxx        20 Oct 2003 19:28:55 -0000      1.3
@@ -23,6 +23,7 @@
 #include "../libxmlfwd.hxx"
 #include "drawable.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 /** */
@@ -38,6 +39,7 @@
 };
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 #endif
 

Index: level_dot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/level_dot.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- level_dot.cxx       23 Aug 2003 18:14:33 -0000      1.24
+++ level_dot.cxx       20 Oct 2003 19:28:55 -0000      1.25
@@ -19,7 +19,7 @@
 
 #include <iostream>
 #include <math.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/font.h>
 #include "../input/controller.hxx"
 #include "../input/pointer.hxx"
 #include "../gettext.h"
@@ -37,6 +37,7 @@
 #include "../savegame_manager.hxx"
 #include "level_dot.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 LevelDot::LevelDot(xmlDocPtr doc, xmlNodePtr cur)
@@ -207,5 +208,6 @@
 }
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 /* EOF */

Index: level_dot.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/level_dot.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- level_dot.hxx       19 Apr 2003 10:23:19 -0000      1.10
+++ level_dot.hxx       20 Oct 2003 19:28:55 -0000      1.11
@@ -24,6 +24,7 @@
 #include "../plf_handle.hxx"
 #include "dot.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 /** */
@@ -58,6 +59,7 @@
 };
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 #endif
 

Index: manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- manager.cxx 4 Jun 2003 17:22:33 -0000       1.39
+++ manager.cxx 20 Oct 2003 19:28:55 -0000      1.40
@@ -32,6 +32,7 @@
 #include "../story.hxx"
 #include "../story_screen.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 WorldMapManager* WorldMapManager::instance_ = 0;
@@ -346,5 +347,6 @@
 }
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 /* EOF */

Index: path_graph.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path_graph.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- path_graph.cxx      4 Jun 2003 17:22:33 -0000       1.22
+++ path_graph.cxx      20 Oct 2003 19:28:55 -0000      1.23
@@ -29,6 +29,7 @@
 #include "path_drawable.hxx"
 #include "../globals.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 PathGraph::PathGraph(WorldMap* arg_worldmap, xmlDocPtr doc, xmlNodePtr cur)
@@ -306,5 +307,6 @@
 }
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 /* EOF */

Index: path_graph.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path_graph.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- path_graph.hxx      4 Jun 2003 17:22:33 -0000       1.11
+++ path_graph.hxx      20 Oct 2003 19:28:55 -0000      1.12
@@ -28,6 +28,7 @@
 #include "pathfinder.hxx"
 #include "graph.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 class Dot;
@@ -91,6 +92,7 @@
 };
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 #endif
 

Index: pingus.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/pingus.hxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- pingus.hxx  19 Apr 2003 10:23:19 -0000      1.26
+++ pingus.hxx  20 Oct 2003 19:28:55 -0000      1.27
@@ -25,6 +25,7 @@
 #include "drawable.hxx"
 #include "path_graph.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 /** This is the representation of the horde of Pingus which will walk
@@ -128,6 +129,7 @@
 };
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 #endif
 

Index: sprite_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/sprite_drawable.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sprite_drawable.hxx 19 Apr 2003 10:23:19 -0000      1.3
+++ sprite_drawable.hxx 20 Oct 2003 19:28:55 -0000      1.4
@@ -24,6 +24,7 @@
 #include "../vector.hxx"
 #include "drawable.hxx"
 
+namespace Pingus {
 namespace WorldMapNS {
 
 /** */
@@ -50,6 +51,7 @@
 };
 
 } // namespace WorldMapNS
+} // namespace Pingus
 
 #endif
 

Index: surface_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/surface_drawable.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_drawable.hxx        19 Oct 2003 12:25:47 -0000      1.6
+++ surface_drawable.hxx        20 Oct 2003 19:28:55 -0000      1.7
@@ -20,7 +20,7 @@
 #ifndef HEADER_SURFACE_DRAWABLE_HXX
 #define HEADER_SURFACE_DRAWABLE_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "../vector.hxx"
 #include "drawable.hxx"
 

Index: worldmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- worldmap.hxx        19 Apr 2003 10:23:19 -0000      1.29
+++ worldmap.hxx        20 Oct 2003 19:28:55 -0000      1.30
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_HXX
 #define HEADER_PINGUS_WORLDMAP_WORLDMAP_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include <vector>
 #include "../libxmlfwd.hxx"
 #include "../gui/display_graphic_context.hxx"