[Pingus-CVS] CVS: Games/Pingus/src/worldmap graph.cxx,1.6,1.7 graph.hxx,1.9,1.10 manager.cxx,1.10,1.11 manager.hxx,1.10,1.11 node.cxx,1.7,1.8 node.hxx,1.6,1.7 node_data.cxx,1.4,1.5 node_data.hxx,1.7,1.8 pingus.cxx,1.8,1.9 pingus.hxx,1.10,1.11 stat.cxx,1.8,1.9 stat.hxx,1.6,1.7 worldmap.cxx,1.11,1.12 worldmap.hxx,1.10,1.11

[grumbel]

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

Modified Files:
        graph.cxx graph.hxx manager.cxx manager.hxx node.cxx node.hxx 
        node_data.cxx node_data.hxx pingus.cxx pingus.hxx stat.cxx 
        stat.hxx worldmap.cxx worldmap.hxx 
Log Message:
- removed Pingus namespace mostly
- paked most Editor stuff into EditorNS
- added namespace for ResourceModifier


Index: graph.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/graph.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- graph.cxx   10 Sep 2002 21:03:33 -0000      1.6
+++ graph.cxx   11 Sep 2002 12:45:58 -0000      1.7
@@ -23,8 +23,7 @@
 #include "../xml_helper.hxx"
 #include "graph.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 Graph::Graph ()
 {
@@ -203,7 +202,6 @@
    delete provider;
 */
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: graph.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/graph.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- graph.hxx   10 Sep 2002 12:46:55 -0000      1.9
+++ graph.hxx   11 Sep 2002 12:45:58 -0000      1.10
@@ -24,8 +24,7 @@
 #include "../boost/smart_ptr.hpp"
 #include "node.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 #if 0
 /** This class manages the path of the WorldMap where the pingu can
@@ -94,8 +93,7 @@
   Graph operator= (const Graph&);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif
 

Index: manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- manager.cxx 7 Sep 2002 23:33:47 -0000       1.10
+++ manager.cxx 11 Sep 2002 12:45:58 -0000      1.11
@@ -25,8 +25,7 @@
 #include "worldmap.hxx"
 #include "manager.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 WorldMapManager* WorldMapManager::instance_ = 0;
 
@@ -116,7 +115,6 @@
     return instance_ = new WorldMapManager ();
 }
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- manager.hxx 7 Sep 2002 23:33:47 -0000       1.10
+++ manager.hxx 11 Sep 2002 12:45:58 -0000      1.11
@@ -30,8 +30,7 @@
 class CL_Key;
 class GameDelta;
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 class WorldMap;
 
@@ -106,8 +105,7 @@
   WorldMapManager operator= (const WorldMapManager&);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif
 

Index: node.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/node.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- node.cxx    7 Sep 2002 23:33:47 -0000       1.7
+++ node.cxx    11 Sep 2002 12:45:58 -0000      1.8
@@ -32,8 +32,7 @@
 #include "../screen_manager.hxx"
 #include "node.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 TubeNode::TubeNode (const TubeNodeData& data)
   : TubeNodeData (data),
@@ -178,7 +177,6 @@
   return plf;
 }
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: node.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/node.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- node.hxx    7 Sep 2002 23:33:47 -0000       1.6
+++ node.hxx    11 Sep 2002 12:45:58 -0000      1.7
@@ -26,8 +26,7 @@
 class CL_Vector;
 class PLF;
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 /** An node in the WorldmapGraph on which the Pingu walks */
 class Node 
@@ -115,8 +114,7 @@
   LevelNode operator= (const LevelNode&);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif
 

Index: node_data.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/node_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- node_data.cxx       10 Sep 2002 21:03:33 -0000      1.4
+++ node_data.cxx       11 Sep 2002 12:45:58 -0000      1.5
@@ -21,8 +21,7 @@
 #include "../xml_helper.hxx"
 #include "node.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 NodeData::NodeData (const NodeData& old) : id(old.id),
                                            links(old.links),
@@ -253,7 +252,6 @@
   return new EmptyNodeData ();
 }
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: node_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/node_data.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- node_data.hxx       7 Sep 2002 23:33:47 -0000       1.7
+++ node_data.hxx       11 Sep 2002 12:45:58 -0000      1.8
@@ -47,8 +47,7 @@
    ...
 */
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 class Node;
 
@@ -153,8 +152,7 @@
   static TubeNodeData* create(xmlDocPtr doc, xmlNodePtr cur);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif
 

Index: pingus.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pingus.cxx  7 Sep 2002 23:33:47 -0000       1.8
+++ pingus.cxx  11 Sep 2002 12:45:58 -0000      1.9
@@ -20,8 +20,7 @@
 #include "pingus.hxx"
 #include "../boost/smart_ptr.hpp"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 Pingus::Pingus ()
   : sprite ("Pingus/walker0", "pingus", 20.0f, Sprite::RIGHT)
@@ -115,7 +114,6 @@
   return current_node;
 }
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: pingus.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pingus.hxx  8 Sep 2002 18:13:04 -0000       1.10
+++ pingus.hxx  11 Sep 2002 12:45:58 -0000      1.11
@@ -29,8 +29,7 @@
   template <class T> class shared_ptr;
 }
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 /** This is the representation of the horde of Pingus which will walk
     on the worldmap */
@@ -219,8 +218,7 @@
   Pingus operator= (const Pingus&);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif
 

Index: stat.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/stat.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- stat.cxx    10 Sep 2002 21:03:33 -0000      1.8
+++ stat.cxx    11 Sep 2002 12:45:58 -0000      1.9
@@ -25,8 +25,7 @@
 #include "../xml_helper.hxx"
 #include "stat.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 PingusWorldMapNodeStat::PingusWorldMapNodeStat () 
   : finished(false),
@@ -195,7 +194,6 @@
     }
 }
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: stat.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/stat.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- stat.hxx    7 Sep 2002 23:33:47 -0000       1.6
+++ stat.hxx    11 Sep 2002 12:45:58 -0000      1.7
@@ -23,8 +23,7 @@
 #include <map>
 #include "graph.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 /** This class holds the information on a level's completeness, etc.
     It's only here for internal use by PingusWorldMapStat. */
@@ -82,8 +81,7 @@
   PingusWorldMapStat operator= (const PingusWorldMapStat&);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif
 

Index: worldmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- worldmap.cxx        8 Sep 2002 18:13:04 -0000       1.11
+++ worldmap.cxx        11 Sep 2002 12:45:58 -0000      1.12
@@ -33,8 +33,7 @@
 #include "worldmap.hxx"
 #include "pingus.hxx"
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 WorldMap::WorldMap (std::string filename) 
   : green_dot ("worldmap/dot_green", "core"),
@@ -298,7 +297,6 @@
     }
 }
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 /* EOF */

Index: worldmap.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- worldmap.hxx        8 Sep 2002 18:13:04 -0000       1.10
+++ worldmap.hxx        11 Sep 2002 12:45:58 -0000      1.11
@@ -27,8 +27,7 @@
 class CL_Font;
 class CL_InputDevice;
 
-namespace pingus {
-namespace worldmap {
+namespace WorldMapNS {
 
 class Pingus;
 
@@ -150,8 +149,7 @@
   WorldMap operator= (const WorldMap&);
 };
 
-} // namespace worldmap
-} // namespace pingus
+} // namespace WorldMapNS
 
 #endif