[Pingus-CVS] r3671 - in trunk/pingus/src: . worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-04 20:56:33 +0200 (Fri, 04 Jul 2008)
New Revision: 3671

Modified:
   trunk/pingus/src/pingus_menu.cpp
   trunk/pingus/src/story_screen.cpp
   trunk/pingus/src/story_screen.hpp
   trunk/pingus/src/worldmap/dot.cpp
   trunk/pingus/src/worldmap/dot.hpp
   trunk/pingus/src/worldmap/dot_factory.cpp
   trunk/pingus/src/worldmap/dot_factory.hpp
   trunk/pingus/src/worldmap/drawable.hpp
   trunk/pingus/src/worldmap/drawable_factory.cpp
   trunk/pingus/src/worldmap/drawable_factory.hpp
   trunk/pingus/src/worldmap/graph.cpp
   trunk/pingus/src/worldmap/graph.hpp
   trunk/pingus/src/worldmap/level_dot.cpp
   trunk/pingus/src/worldmap/level_dot.hpp
   trunk/pingus/src/worldmap/path.cpp
   trunk/pingus/src/worldmap/path.hpp
   trunk/pingus/src/worldmap/path_drawable.cpp
   trunk/pingus/src/worldmap/path_drawable.hpp
   trunk/pingus/src/worldmap/path_graph.cpp
   trunk/pingus/src/worldmap/path_graph.hpp
   trunk/pingus/src/worldmap/pathfinder.hpp
   trunk/pingus/src/worldmap/pingus.cpp
   trunk/pingus/src/worldmap/pingus.hpp
   trunk/pingus/src/worldmap/sprite_drawable.cpp
   trunk/pingus/src/worldmap/sprite_drawable.hpp
   trunk/pingus/src/worldmap/surface_drawable.cpp
   trunk/pingus/src/worldmap/surface_drawable.hpp
   trunk/pingus/src/worldmap/worldmap.cpp
   trunk/pingus/src/worldmap/worldmap.hpp
   trunk/pingus/src/worldmap/worldmap_component.cpp
   trunk/pingus/src/worldmap/worldmap_component.hpp
   trunk/pingus/src/worldmap/worldmap_screen.cpp
   trunk/pingus/src/worldmap/worldmap_screen.hpp
   trunk/pingus/src/worldmap/worldmap_story.cpp
   trunk/pingus/src/worldmap/worldmap_story.hpp
Log:
Renamed WorldMap to Worldmap

Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp    2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/pingus_menu.cpp    2008-07-04 18:56:33 UTC (rev 3671)
@@ -104,12 +104,12 @@
   if (!story_seen)
     {
       ScreenManager::instance()->push_screen
-        (new 
StoryScreen(WorldMapNS::WorldMapScreen::instance()->get_worldmap()->get_intro_story()),
 true);
+        (new 
StoryScreen(WorldmapNS::WorldMapScreen::instance()->get_worldmap()->get_intro_story()),
 true);
     }
   else
 #endif
     {
-      std::auto_ptr<WorldMapScreen> worldmap_screen(new WorldMapScreen());
+      std::auto_ptr<WorldmapScreen> worldmap_screen(new WorldMapScreen());
       worldmap_screen->load(filename);
       ScreenManager::instance()->push_screen(worldmap_screen.release(), true);
     }

Modified: trunk/pingus/src/story_screen.cpp
===================================================================
--- trunk/pingus/src/story_screen.cpp   2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/story_screen.cpp   2008-07-04 18:56:33 UTC (rev 3671)
@@ -45,12 +45,12 @@
 
   bool page_displayed_completly;
 
-  WorldMapNS::WorldMapStory *story;
+  WorldmapNS::WorldMapStory *story;
   std::vector<StoryPage> pages;
   Sprite page_surface;
   StoryPage  current_page;
 public:
-  StoryScreenComponent (WorldMapNS::WorldMapStory *arg_pages);
+  StoryScreenComponent (WorldmapNS::WorldMapStory *arg_pages);
   virtual ~StoryScreenComponent () {}
 
   void draw (DrawingContext& gc);
@@ -59,7 +59,7 @@
   void skip_story();
   /** starts to display the next text page */
   void next_text();
-  WorldMapNS::WorldMapStory* get_story() const { return story; }
+  WorldmapNS::WorldMapStory* get_story() const { return story; }
 };
 
 class StoryScreenContinueButton : public GUI::SurfaceButton
@@ -122,7 +122,7 @@
   }
 };
 
-StoryScreen::StoryScreen(WorldMapNS::WorldMapStory *arg_pages)
+StoryScreen::StoryScreen(WorldmapNS::WorldMapStory *arg_pages)
 {
   story_comp = new StoryScreenComponent(arg_pages);
   gui_manager->add (story_comp, true);
@@ -134,7 +134,7 @@
 {
 }
 
-StoryScreenComponent::StoryScreenComponent (WorldMapNS::WorldMapStory 
*arg_story)
+StoryScreenComponent::StoryScreenComponent (WorldmapNS::WorldMapStory 
*arg_story)
   : story(arg_story)
 {
   page_displayed_completly = false;
@@ -189,13 +189,13 @@
 void
 StoryScreen::on_escape_press ()
 {
-  ScreenManager::instance()->replace_screen(new WorldMapScreen(), true);
+  ScreenManager::instance()->replace_screen(new WorldmapScreen(), true);
 }
 
 void
 StoryScreen::on_startup()
 {
-  // FIXME: Load the song from the WorldMapStory
+  // FIXME: Load the song from the WorldmapStory
   Sound::PingusSound::play_music(story_comp->get_story()->get_music(), .7f);
 }
 
@@ -232,30 +232,30 @@
           
 #if 0 // FIXME: Fri Jul  4 10:34:19 2008
           //Out of story pages - figure out which one this was (start or end)
-          if (story == 
WorldMapNS::WorldMapScreen::instance()->get_worldmap()->get_intro_story())
+          if (story == 
WorldmapNS::WorldMapScreen::instance()->get_worldmap()->get_intro_story())
             which_story = "start";
           else
             which_story = "end";
 
           // Record that player has seen this story.
-          
StatManager::instance()->set_bool(WorldMapNS::WorldMapScreen::instance()->get_worldmap()->get_shortname()
+          
StatManager::instance()->set_bool(WorldmapNS::WorldMapScreen::instance()->get_worldmap()->get_shortname()
                                             + "-" + which_story + 
"story-seen", true);
 
           bool credits_seen = false;
           //Check if this is the last worldmap
           if (which_story == "end" &&
-              
WorldMapNS::WorldMapScreen::instance()->get_worldmap()->is_final_map())
+              
WorldmapNS::WorldMapScreen::instance()->get_worldmap()->is_final_map())
             {
               // Check if final credits have been seen
               StatManager::instance()->get_bool("credits-seen", credits_seen);
               if (!credits_seen)
                 ScreenManager::instance()->replace_screen(new Credits(), true);
               else
-                ScreenManager::instance()->replace_screen(new 
WorldMapNS::WorldMapScreen(), true);
+                ScreenManager::instance()->replace_screen(new 
WorldmapNS::WorldMapScreen(), true);
             }
           else
             {
-              ScreenManager::instance()->replace_screen(new 
WorldMapNS::WorldMapScreen()), true);
+              ScreenManager::instance()->replace_screen(new 
WorldmapNS::WorldMapScreen()), true);
             }
 #endif
         }

Modified: trunk/pingus/src/story_screen.hpp
===================================================================
--- trunk/pingus/src/story_screen.hpp   2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/story_screen.hpp   2008-07-04 18:56:33 UTC (rev 3671)
@@ -25,7 +25,7 @@
 
 class StoryScreenComponent;
 
-using namespace WorldMapNS;
+using namespace WorldmapNS;
 
 /** */
 class StoryScreen : public GUIScreen
@@ -33,7 +33,7 @@
 private:
   StoryScreenComponent* story_comp;
 public:
-       StoryScreen(WorldMapStory *pages);
+       StoryScreen(WorldmapStory *pages);
   ~StoryScreen();
 
   void on_startup();

Modified: trunk/pingus/src/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot.cpp   2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/worldmap/dot.cpp   2008-07-04 18:56:33 UTC (rev 3671)
@@ -19,7 +19,7 @@
 #include "../file_reader.hpp"
 #include "dot.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 Dot::Dot(FileReader reader)
   : Drawable()
@@ -30,6 +30,6 @@
   assert(!name.empty());
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot.hpp   2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/worldmap/dot.hpp   2008-07-04 18:56:33 UTC (rev 3671)
@@ -21,7 +21,7 @@
 #include "../math/vector3f.hpp"
 #include "drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** A Dot is a node between all the pathes on the worldmap, there are
     LevelDots TubeDots and other availabe. */
@@ -49,7 +49,7 @@
   Dot& operator= (const Dot&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/dot_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.cpp   2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/dot_factory.cpp   2008-07-04 18:56:33 UTC (rev 
3671)
@@ -18,7 +18,7 @@
 #include "level_dot.hpp"
 #include "dot_factory.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 Dot*
 DotFactory::create(FileReader reader)
@@ -34,6 +34,6 @@
   return 0;
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/dot_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.hpp   2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/dot_factory.hpp   2008-07-04 18:56:33 UTC (rev 
3671)
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_DOT_FACTORY_HPP
 #define HEADER_PINGUS_DOT_FACTORY_HPP
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 class Dot;
 
@@ -33,7 +33,7 @@
   DotFactory& operator= (const DotFactory&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.hpp      2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/drawable.hpp      2008-07-04 18:56:33 UTC (rev 
3671)
@@ -22,7 +22,7 @@
 
 class DrawingContext;
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** An drawable object on the worldmap, such has a background or a
     sprite, interface only */
@@ -66,7 +66,7 @@
   Drawable& operator= (const Drawable&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/drawable_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.cpp      2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/drawable_factory.cpp      2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -19,7 +19,7 @@
 #include "sprite_drawable.hpp"
 #include "drawable_factory.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 Drawable*
 DrawableFactory::create(FileReader reader)
@@ -35,6 +35,6 @@
     }
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.hpp      2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/drawable_factory.hpp      2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -19,7 +19,7 @@
 
 #include "drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** */
 class DrawableFactory
@@ -33,7 +33,7 @@
   DrawableFactory& operator= (const DrawableFactory&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/graph.cpp 2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/worldmap/graph.cpp 2008-07-04 18:56:33 UTC (rev 3671)
@@ -16,11 +16,11 @@
 
 #include "graph.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 const NodeId NoNode = -1;
 const EdgeId NoEdge = -1;
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/graph.hpp 2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/worldmap/graph.hpp 2008-07-04 18:56:33 UTC (rev 3671)
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <vector>
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 typedef int NodeId;
 typedef int EdgeId;
@@ -175,7 +175,7 @@
   }
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp     2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/level_dot.cpp     2008-07-04 18:56:33 UTC (rev 
3671)
@@ -32,7 +32,7 @@
 #include "input/control.hpp"
 #include "level_dot.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 LevelDot::LevelDot(FileReader reader)
   : Dot(reader.read_section("dot")),
@@ -185,6 +185,6 @@
     }
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.hpp     2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/level_dot.hpp     2008-07-04 18:56:33 UTC (rev 
3671)
@@ -21,7 +21,7 @@
 #include "../pingus_level.hpp"
 #include "dot.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** */
 class LevelDot : public Dot
@@ -54,7 +54,7 @@
   LevelDot& operator= (const LevelDot&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/worldmap/path.cpp  2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/worldmap/path.cpp  2008-07-04 18:56:33 UTC (rev 3671)
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include "path.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 Path::Path()
   : path_length_valid (false)
@@ -103,6 +103,6 @@
   std::reverse(vec.begin (), vec.end ());
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/path.hpp
===================================================================
--- trunk/pingus/src/worldmap/path.hpp  2008-07-04 18:51:40 UTC (rev 3670)
+++ trunk/pingus/src/worldmap/path.hpp  2008-07-04 18:56:33 UTC (rev 3671)
@@ -21,7 +21,7 @@
 #include <vector>
 #include "../math/vector3f.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** a wrapper class around std::vector<Vector>, which can calculate
     the length of the path and a few other things */
@@ -82,7 +82,7 @@
   void reverse();
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.cpp 2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/path_drawable.cpp 2008-07-04 18:56:33 UTC (rev 
3671)
@@ -19,7 +19,7 @@
 #include "../display/drawing_context.hpp"
 #include "path_drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 PathDrawable::PathDrawable (const Path& arg_path)
   : path(arg_path)
@@ -46,6 +46,6 @@
   UNUSED_ARG(delta);
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/path_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.hpp 2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/path_drawable.hpp 2008-07-04 18:56:33 UTC (rev 
3671)
@@ -20,7 +20,7 @@
 #include "drawable.hpp"
 #include "path_graph.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** Drawable to show the path between two nodes, only used for
     debugging */
@@ -39,7 +39,7 @@
   PathDrawable& operator= (const PathDrawable&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp    2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/path_graph.cpp    2008-07-04 18:56:33 UTC (rev 
3671)
@@ -26,9 +26,9 @@
 #include "path_drawable.hpp"
 #include "../globals.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
-PathGraph::PathGraph(WorldMap* arg_worldmap, FileReader &reader)
+PathGraph::PathGraph(Worldmap* arg_worldmap, FileReader &reader)
   : worldmap(arg_worldmap)
 {
   parse_nodes(reader.read_section("nodes"));
@@ -267,6 +267,6 @@
     *i = 0;
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.hpp    2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/path_graph.hpp    2008-07-04 18:56:33 UTC (rev 
3671)
@@ -24,16 +24,16 @@
 #include "pathfinder.hpp"
 #include "graph.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 class Dot;
-class WorldMap;
+class Worldmap;
 
 /** This class represents the walkable path on the Worldmap */
 class PathGraph
 {
 private:
-  WorldMap* worldmap;
+  Worldmap* worldmap;
 
 public:
   // FIXME: Memory leak? Where do we free stuff data inside the graph?
@@ -56,7 +56,7 @@
   /** @param worldmap is a pointer to the worldmap that holds this
       PathGraph, it is used so that the PathGraph can insert its
       drawables into the world */
-  PathGraph(WorldMap* worldmap, FileReader &reader);
+  PathGraph(Worldmap* worldmap, FileReader &reader);
 
   ~PathGraph();
 
@@ -87,7 +87,7 @@
   PathGraph& operator= (const PathGraph&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/worldmap/pathfinder.hpp    2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/pathfinder.hpp    2008-07-04 18:56:33 UTC (rev 
3671)
@@ -20,7 +20,7 @@
 #include <queue>
 #include "graph.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 struct PathfinderResult
 {
@@ -175,7 +175,7 @@
   Pathfinder operator= (const Pathfinder&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp        2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/pingus.cpp        2008-07-04 18:56:33 UTC (rev 
3671)
@@ -24,7 +24,7 @@
 #include "../resource.hpp"
 #include "pingus.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 Pingus::Pingus (PathGraph* arg_path)
   : Drawable("pingus"),
@@ -253,6 +253,6 @@
   return current_node == NoNode;
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/pingus.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.hpp        2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/pingus.hpp        2008-07-04 18:56:33 UTC (rev 
3671)
@@ -21,7 +21,7 @@
 #include "drawable.hpp"
 #include "path_graph.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** This is the representation of the horde of Pingus which will walk
     on the worldmap */
@@ -120,7 +120,7 @@
   Pingus& operator= (const Pingus&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.cpp       2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/sprite_drawable.cpp       2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -17,7 +17,7 @@
 #include "../display/drawing_context.hpp"
 #include "sprite_drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 SpriteDrawable::SpriteDrawable(FileReader reader)
   : Drawable(reader)
@@ -36,6 +36,6 @@
   gc.draw(sprite, pos);
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.hpp       2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/sprite_drawable.hpp       2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -21,7 +21,7 @@
 #include "../math/vector3f.hpp"
 #include "drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** */
 class SpriteDrawable : public Drawable
@@ -46,7 +46,7 @@
   SpriteDrawable operator= (const SpriteDrawable&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/surface_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/surface_drawable.cpp      2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/surface_drawable.cpp      2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -23,7 +23,7 @@
 #include "pingus.hpp"
 #include "surface_drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 SurfaceDrawable::SurfaceDrawable(FileReader reader)
   : Drawable(reader)
@@ -52,7 +52,7 @@
     {
       if (auto_uncover)
         {
-          Vector3f pingus_pos = WorldMap::current()->get_pingus()->get_pos();
+          Vector3f pingus_pos = Worldmap::current()->get_pingus()->get_pos();
           // Pingu is not over the surface
           if (!(pingus_pos.x > pos.x && pingus_pos.x < pos.x + 
surface.get_width()
                 &&
@@ -72,6 +72,6 @@
     }
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/surface_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/surface_drawable.hpp      2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/surface_drawable.hpp      2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -21,7 +21,7 @@
 #include "../math/vector3f.hpp"
 #include "drawable.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 /** */
 class SurfaceDrawable : public Drawable
@@ -44,7 +44,7 @@
   SurfaceDrawable& operator= (const SurfaceDrawable&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp      2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/worldmap.cpp      2008-07-04 18:56:33 UTC (rev 
3671)
@@ -47,11 +47,11 @@
 #include "../story_screen.hpp"
 #include "../screen/screen_manager.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
-WorldMap* WorldMap::current_ = 0; 
+Worldmap* WorldMap::current_ = 0; 
 
-WorldMap::WorldMap(const std::string& arg_filename)
+Worldmap::WorldMap(const std::string& arg_filename)
   : filename(arg_filename),
     mouse_x(0),
     mouse_y(0)
@@ -67,7 +67,7 @@
   gc_state.set_limit(Rect(Vector2i(0, 0), Size(width, height)));
 }
 
-WorldMap::~WorldMap()
+Worldmap::~WorldMap()
 {
   for (DrawableLst::iterator i = drawables.begin (); i != drawables.end (); 
++i)
     {
@@ -79,29 +79,29 @@
 }
 
 void
-WorldMap::parse_file(FileReader reader)
+Worldmap::parse_file(FileReader reader)
 {
   if (reader.get_name() == "pingus-worldmap")
     {
       parse_graph(reader.read_section("graph"));
       parse_objects(reader.read_section("objects"));
       parse_properties(reader.read_section("head"));
-      intro_story = new WorldMapStory(reader.read_section("intro_story"));
-      end_story   = new WorldMapStory(reader.read_section("end_story"));
+      intro_story = new WorldmapStory(reader.read_section("intro_story"));
+      end_story   = new WorldmapStory(reader.read_section("end_story"));
     }
   else
     {
-      PingusError::raise("WorldMap:" + filename + ": not a Worldmap file");
+      PingusError::raise("Worldmap:" + filename + ": not a Worldmap file");
     }
 
   if (!path_graph)
     {
-      PingusError::raise("WorldMap: " + filename + " missed Graph");
+      PingusError::raise("Worldmap: " + filename + " missed Graph");
     }
 }
 
 void
-WorldMap::parse_objects(FileReader reader)
+Worldmap::parse_objects(FileReader reader)
 {
   const std::vector<FileReader>& childs = reader.get_sections();
   
@@ -117,19 +117,19 @@
         }
       else
         {
-          std::cout << "WorldMap::parse_objects: Parse Error" << std::endl;
+          std::cout << "Worldmap::parse_objects: Parse Error" << std::endl;
         }
     }
 }
 
 void
-WorldMap::parse_graph(FileReader reader)
+Worldmap::parse_graph(FileReader reader)
 {
   path_graph = new PathGraph(this, reader);
 }
 
 void
-WorldMap::parse_properties(FileReader reader)
+Worldmap::parse_properties(FileReader reader)
 {
   reader.read_string("music", music);
   reader.read_string("author", author);
@@ -148,7 +148,7 @@
 }
 
 void
-WorldMap::draw(DrawingContext& gc)
+Worldmap::draw(DrawingContext& gc)
 {
   Vector3f pingu_pos = pingus->get_pos();
   float min, max;
@@ -194,7 +194,7 @@
 }
 
 void
-WorldMap::update (float delta)
+Worldmap::update (float delta)
 {
   for (DrawableLst::iterator i = drawables.begin (); i != drawables.end (); 
++i)
     {
@@ -203,39 +203,39 @@
 }
 
 void
-WorldMap::on_startup()
+Worldmap::on_startup()
 {
   Sound::PingusSound::play_music(music);
   update_locked_nodes();
 }
 
 void
-WorldMap::add_drawable(Drawable* drawable)
+Worldmap::add_drawable(Drawable* drawable)
 {
   drawables.push_back(drawable);
 }
 
 void
-WorldMap::remove_drawable(Drawable* drawable)
+Worldmap::remove_drawable(Drawable* drawable)
 {
   UNUSED_ARG(drawable);
 }
 
 void
-WorldMap::set_pingus(NodeId id)
+Worldmap::set_pingus(NodeId id)
 {
   UNUSED_ARG(id);
 }
 
 void
-WorldMap::on_pointer_move(int x, int y)
+Worldmap::on_pointer_move(int x, int y)
 {
   mouse_x = x;
   mouse_y = y;
 }
 
 void
-WorldMap::on_primary_button_press(int x, int y)
+Worldmap::on_primary_button_press(int x, int y)
 {
   Vector2f click_pos = gc_state.screen2world(Vector2i(x, y));
 
@@ -259,12 +259,12 @@
   if (dot)
     {
       if (maintainer_mode)
-        std::cout << "WorldMap: Clicked on: " << dot->get_name() << std::endl;
+        std::cout << "Worldmap: Clicked on: " << dot->get_name() << std::endl;
 
       if (path_graph->lookup_node(dot->get_name()) == pingus->get_node())
         {
           if (maintainer_mode)
-            std::cout << "WorldMap: Pingu is on node, issue on_click()" << 
std::endl;
+            std::cout << "Worldmap: Pingu is on node, issue on_click()" << 
std::endl;
           dot->on_click();
         }
       else
@@ -274,7 +274,7 @@
               if 
(!pingus->walk_to_node(path_graph->lookup_node(dot->get_name())))
                 {
                   if (maintainer_mode)
-                    std::cout << "WorldMap: NO PATH TO NODE FOUND!" << 
std::endl;
+                    std::cout << "Worldmap: NO PATH TO NODE FOUND!" << 
std::endl;
                 }
               else
                 {
@@ -290,7 +290,7 @@
 }
 
 void
-WorldMap::on_secondary_button_press(int x, int y)
+Worldmap::on_secondary_button_press(int x, int y)
 {
   if (maintainer_mode)
     {
@@ -306,7 +306,7 @@
 }
 
 void
-WorldMap::enter_level()
+Worldmap::enter_level()
 {
   NodeId node = get_pingus()->get_node();
 
@@ -321,7 +321,7 @@
   else
     {
       if (maintainer_mode)
-        std::cout << "WorldMap: Pingus not on level" << std::endl;
+        std::cout << "Worldmap: Pingus not on level" << std::endl;
     }
 }
 
@@ -351,7 +351,7 @@
 };
 
 void
-WorldMap::update_locked_nodes()
+Worldmap::update_locked_nodes()
 { // FIXME: This shouldn't be a polling function
   path_graph->graph.for_each_node(unlock_nodes(path_graph));
 
@@ -371,14 +371,14 @@
         }
       else
         {
-          std::cout << "Error: WorldMap: Last level missing" << std::endl;
+          std::cout << "Error: Worldmap: Last level missing" << std::endl;
         }
     }
 }
 
 // Determine starting node
 void
-WorldMap::set_starting_node()
+Worldmap::set_starting_node()
 {
   // See if the user has played this map before.  If not, use the 
<default-node>
   // tag from the XML file.
@@ -402,13 +402,13 @@
 }
 
 bool
-WorldMap::is_final_map()
+Worldmap::is_final_map()
 {
   return pingus->get_node() == final_node;
 }
 
 std::string
-WorldMap::get_levelname()
+Worldmap::get_levelname()
 {
   if (pingus->get_node() != NoNode)
     {
@@ -424,6 +424,6 @@
     }
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.hpp      2008-07-04 18:51:40 UTC (rev 
3670)
+++ trunk/pingus/src/worldmap/worldmap.hpp      2008-07-04 18:56:33 UTC (rev 
3671)
@@ -26,12 +26,12 @@
 class Font;
 class DrawingContext;
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 typedef int EdgeId;
 typedef int NodeId;
 
-class WorldMapStory;
+class WorldmapStory;
 class PathGraph;
 class Drawable;
 class Pingus;
@@ -41,14 +41,14 @@
     (bidirectional graph) where a pingu can walk on. Parts of the
     worldmap are hidable and will only get displayed at specific
     events (successfull level completions, etc.). */
-class WorldMap
+class Worldmap
 {
 private:
   /** name of the file to parse */
   std::string filename;
 
-  WorldMapStory *intro_story;
-  WorldMapStory *end_story;
+  WorldmapStory *intro_story;
+  WorldmapStory *end_story;
 
   typedef std::vector<Drawable*>   ObjectLst;
   typedef std::vector<Drawable*> DrawableLst;
@@ -86,17 +86,17 @@
   int mouse_y;
 
 private:
-  static WorldMap* current_; 
+  static Worldmap* current_; 
 public:
-  static WorldMap* current() { return current_; }
+  static Worldmap* current() { return current_; }
 
   /** Load the given*/
-  WorldMap(const std::string& filename);
-  ~WorldMap();
+  Worldmap(const std::string& filename);
+  ~Worldmap();
 
   Pingus* get_pingus() { return pingus; }
-  WorldMapStory* get_intro_story() const { return intro_story; }
-  WorldMapStory* get_end_story() const { return end_story; }
+  WorldmapStory* get_intro_story() const { return intro_story; }
+  WorldmapStory* get_end_story() const { return end_story; }
 
   void on_startup();
 
@@ -124,7 +124,7 @@
   /** @return the shortest path between node1 and node2  */
   std::vector<EdgeId> find_path (NodeId node1, NodeId node2);
 
-  /** x,y are in WorldMap CO, not ScreenCO */
+  /** x,y are in Worldmap CO, not ScreenCO */
   void on_primary_button_press(int x, int y);
   void on_secondary_button_press(int x, int y);
   void on_pointer_move(int x, int y);
@@ -133,18 +133,18 @@
   int get_height() const { return height; }
 
 private:
-  /** Parses a WorldMap XML file */
+  /** Parses a Worldmap XML file */
   void parse_file(FileReader reader);
 
   /** Parse the object section of the Worldmap XML file, it contains
       Sprites, Backgrounds and other things */
   void parse_objects(FileReader reader);
 
-  /** Parse the graph section of the WorldMap XML file, it contains
+  /** Parse the graph section of the Worldmap XML file, it contains
       the path where the Pingu can walk on. */
   void parse_graph(FileReader reader);
 
-  /** Parse the propertie section of a WorldMap XML file, it contains
+  /** Parse the propertie section of a Worldmap XML file, it contains
       meta data such as the author or the name of the Worldmap */
   void parse_properties(FileReader reader);
 
@@ -156,7 +156,7 @@
   void set_starting_node();
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp    2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp    2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -20,23 +20,23 @@
 #include "worldmap.hpp"
 #include "worldmap_component.hpp"
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
-WorldMapComponent::WorldMapComponent(WorldMapScreen* worldmap_screen)
+WorldmapComponent::WorldMapComponent(WorldMapScreen* worldmap_screen)
   : scene_context(new SceneContext()),
     worldmap_screen(worldmap_screen)
     
 {
 }
 
-WorldMapComponent::~WorldMapComponent()
+WorldmapComponent::~WorldMapComponent()
 {
 }
 
 void
-WorldMapComponent::draw (DrawingContext& gc)
+WorldmapComponent::draw (DrawingContext& gc)
 {
-  WorldMap* worldmap = worldmap_screen->get_worldmap();
+  Worldmap* worldmap = worldmap_screen->get_worldmap();
 
   Rect cliprect = worldmap_screen->get_trans_rect();
 
@@ -73,14 +73,14 @@
 }
 
 void
-WorldMapComponent::update (float delta)
+WorldmapComponent::update (float delta)
 {
   worldmap_screen->get_worldmap()->update(delta);
 }
 
 
 void
-WorldMapComponent::on_primary_button_press (int x, int y)
+WorldmapComponent::on_primary_button_press (int x, int y)
 {
   Rect cliprect = worldmap_screen->get_trans_rect();
   worldmap_screen->get_worldmap()->on_primary_button_press(x - cliprect.left,
@@ -89,7 +89,7 @@
 
 
 void
-WorldMapComponent::on_pointer_move (int x, int y)
+WorldmapComponent::on_pointer_move (int x, int y)
 {
   Rect cliprect = worldmap_screen->get_trans_rect();
   worldmap_screen->get_worldmap()->on_pointer_move(x - cliprect.left,
@@ -97,13 +97,13 @@
 }
 
 void
-WorldMapComponent::on_secondary_button_press (int x, int y)
+WorldmapComponent::on_secondary_button_press (int x, int y)
 {
   Rect cliprect = worldmap_screen->get_trans_rect();
   worldmap_screen->get_worldmap()->on_secondary_button_press(x - cliprect.left,
                                                        y - cliprect.top);
 }
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.hpp    2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/worldmap_component.hpp    2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -23,20 +23,20 @@
 
 class SceneContext;
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
-class WorldMapScreen;
-class WorldMap;
+class WorldmapScreen;
+class Worldmap;
 
-class WorldMapComponent : public GUI::Component
+class WorldmapComponent : public GUI::Component
 {
 private:
   std::auto_ptr<SceneContext> scene_context;
-  WorldMapScreen* worldmap_screen;
+  WorldmapScreen* worldmap_screen;
   
 public:
-  WorldMapComponent(WorldMapScreen* worldmap_screen);
-  ~WorldMapComponent();
+  WorldmapComponent(WorldMapScreen* worldmap_screen);
+  ~WorldmapComponent();
 
   void on_primary_button_press (int x, int y);
   void on_secondary_button_press (int x, int y);
@@ -48,11 +48,11 @@
   bool is_at (int, int) { return true; }
 
 private:
-  WorldMapComponent (const WorldMapComponent&);
-  WorldMapComponent& operator= (const WorldMapComponent&);
+  WorldmapComponent (const WorldMapComponent&);
+  WorldmapComponent& operator= (const WorldMapComponent&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -34,55 +34,55 @@
 #include "../story_screen.hpp"
 #include "worldmap_screen.hpp"
 
-class WorldMapScreenCloseButton
+class WorldmapScreenCloseButton
   : public GUI::SurfaceButton
 {
 private: 
-  WorldMapScreen* worldmap_screen;
+  WorldmapScreen* worldmap_screen;
 public:
-  WorldMapScreenCloseButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenCloseButton(WorldMapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
 };
 
-class WorldMapScreenStoryButton
+class WorldmapScreenStoryButton
   : public GUI::SurfaceButton
 {
 private:
-  WorldMapScreen* worldmap_screen;
+  WorldmapScreen* worldmap_screen;
 public:
-  WorldMapScreenStoryButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenStoryButton(WorldMapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
 };
 
-class WorldMapScreenCreditsButton
+class WorldmapScreenCreditsButton
   : public GUI::SurfaceButton
 {
 private:
-  WorldMapScreen* worldmap_screen;
+  WorldmapScreen* worldmap_screen;
 public:
-  WorldMapScreenCreditsButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenCreditsButton(WorldMapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
 };
 
-class WorldMapScreenEnterButton
+class WorldmapScreenEnterButton
   : public GUI::SurfaceButton
 {
 private:
-  WorldMapScreen* worldmap_screen;
+  WorldmapScreen* worldmap_screen;
 public:
-  WorldMapScreenEnterButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenEnterButton(WorldMapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
 };
 
-WorldMapScreenCreditsButton::WorldMapScreenCreditsButton(WorldMapScreen* 
worldmap_screen)
+WorldmapScreenCreditsButton::WorldMapScreenCreditsButton(WorldMapScreen* 
worldmap_screen)
   : GUI::SurfaceButton(Display::get_width() - 150, 0,
                        ResDescriptor("core/worldmap/credits_button_normal"),
                        ResDescriptor("core/worldmap/credits_button_pressed"),
@@ -92,27 +92,27 @@
 }
 
 void
-WorldMapScreenCreditsButton::on_pointer_enter()
+WorldmapScreenCreditsButton::on_pointer_enter()
 {
   SurfaceButton::on_pointer_enter();
   Sound::PingusSound::play_sound ("tick");
 }
 
 void
-WorldMapScreenCreditsButton::draw (DrawingContext& gc)
+WorldmapScreenCreditsButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
   gc.print_center(Fonts::chalk_small, Display::get_width() - 59 - 24, 2, 
_("Show Ending?"));
 }
 
 void
-WorldMapScreenCreditsButton::on_click()
+WorldmapScreenCreditsButton::on_click()
 {
   ScreenManager::instance()->replace_screen
     (new StoryScreen(worldmap_screen->get_worldmap()->get_end_story()), true);
 }
 
-WorldMapScreenStoryButton::WorldMapScreenStoryButton(WorldMapScreen* 
worldmap_screen)
+WorldmapScreenStoryButton::WorldMapScreenStoryButton(WorldMapScreen* 
worldmap_screen)
   : GUI::SurfaceButton(0, 0,
                        ResDescriptor("core/worldmap/story_button_normal"),
                        ResDescriptor("core/worldmap/story_button_pressed"),
@@ -122,27 +122,27 @@
 }
 
 void
-WorldMapScreenStoryButton::on_pointer_enter()
+WorldmapScreenStoryButton::on_pointer_enter()
 {
   SurfaceButton::on_pointer_enter();
   Sound::PingusSound::play_sound ("tick");
 }
 
 void
-WorldMapScreenStoryButton::draw (DrawingContext& gc)
+WorldmapScreenStoryButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
   gc.print_center(Fonts::chalk_small, 59, 2, _("Show Story?"));
 }
 
 void
-WorldMapScreenStoryButton::on_click()
+WorldmapScreenStoryButton::on_click()
 {
   ScreenManager::instance()->replace_screen
     (new StoryScreen(worldmap_screen->get_worldmap()->get_intro_story()), 
true);
 }
 
-WorldMapScreenCloseButton::WorldMapScreenCloseButton(WorldMapScreen* 
worldmap_screen)
+WorldmapScreenCloseButton::WorldMapScreenCloseButton(WorldMapScreen* 
worldmap_screen)
   : GUI::SurfaceButton(0, Display::get_height() - 37,
                        ResDescriptor("core/worldmap/leave_button_normal"),
                        ResDescriptor("core/worldmap/leave_button_pressed"),
@@ -152,26 +152,26 @@
 }
 
 void
-WorldMapScreenCloseButton::on_pointer_enter()
+WorldmapScreenCloseButton::on_pointer_enter()
 {
   SurfaceButton::on_pointer_enter();
   Sound::PingusSound::play_sound ("tick");
 }
 
 void
-WorldMapScreenCloseButton::draw (DrawingContext& gc)
+WorldmapScreenCloseButton::draw (DrawingContext& gc)
 {
   SurfaceButton::draw(gc);
   gc.print_center(Fonts::chalk_small, 44, Display::get_height() - 25, 
_("Leave?"));
 }
 
 void
-WorldMapScreenCloseButton::on_click()
+WorldmapScreenCloseButton::on_click()
 {
   ScreenManager::instance ()->pop_screen ();
 }
 
-WorldMapScreenEnterButton::WorldMapScreenEnterButton(WorldMapScreen* 
worldmap_screen)
+WorldmapScreenEnterButton::WorldMapScreenEnterButton(WorldMapScreen* 
worldmap_screen)
   : GUI::SurfaceButton(Display::get_width() - 119, Display::get_height() - 37,
                        ResDescriptor("core/worldmap/enter_button_normal"),
                        ResDescriptor("core/worldmap/enter_button_pressed"),
@@ -181,7 +181,7 @@
 }
 
 void
-WorldMapScreenEnterButton::on_pointer_enter()
+WorldmapScreenEnterButton::on_pointer_enter()
 {
   SurfaceButton::on_pointer_enter();
   if (!worldmap_screen->get_worldmap()->get_pingus()->is_walking())
@@ -191,7 +191,7 @@
 }
 
 void
-WorldMapScreenEnterButton::draw (DrawingContext& gc)
+WorldmapScreenEnterButton::draw (DrawingContext& gc)
 {
   if (worldmap_screen->get_worldmap()->get_pingus()->is_walking())
     {
@@ -208,12 +208,12 @@
 }
 
 void
-WorldMapScreenEnterButton::on_click()
+WorldmapScreenEnterButton::on_click()
 {
   worldmap_screen->get_worldmap()->enter_level();
 }
 
-WorldMapScreen::WorldMapScreen ()
+WorldmapScreen::WorldMapScreen ()
   : levelname_bg(Sprite("core/worldmap/levelname_bg")),
     is_init(false),
     exit_worldmap(false),
@@ -223,31 +223,31 @@
   // FIXME: a bit ugly because of the proteced member, but should work
   // FIXME: well enough. GUIScreen could also use multi-inheritage,
   // FIXME: but that could lead to member function name conflicts
-  gui_manager->add(new WorldMapComponent(this), true);
-  gui_manager->add(new WorldMapScreenCloseButton(this), true);
-  gui_manager->add(new WorldMapScreenEnterButton(this), true);
-  gui_manager->add(new WorldMapScreenStoryButton(this), true);
+  gui_manager->add(new WorldmapComponent(this), true);
+  gui_manager->add(new WorldmapScreenCloseButton(this), true);
+  gui_manager->add(new WorldmapScreenEnterButton(this), true);
+  gui_manager->add(new WorldmapScreenStoryButton(this), true);
 }
 
 void
-WorldMapScreen::load (const std::string& filename)
+WorldmapScreen::load (const std::string& filename)
 {
   if (worldmap)
     delete worldmap;
 
-  worldmap = new WorldMap(filename);
+  worldmap = new Worldmap(filename);
        
   bool credits_unlocked = false;
   StatManager::instance()->get_bool(worldmap->get_shortname() + 
"-endstory-seen", 
                                     credits_unlocked);
   if (credits_unlocked)
     {
-      gui_manager->add(new WorldMapScreenCreditsButton(this), true);
+      gui_manager->add(new WorldmapScreenCreditsButton(this), true);
     }
 }
 
 void
-WorldMapScreen::on_startup ()
+WorldmapScreen::on_startup ()
 {
   exit_worldmap = false;
   Sound::PingusSound::stop_music();
@@ -256,21 +256,21 @@
     worldmap->on_startup ();
 }
 
-WorldMapScreen::~WorldMapScreen ()
+WorldmapScreen::~WorldMapScreen ()
 {
   delete worldmap;
   delete new_worldmap;
 }
 
 void
-WorldMapScreen::on_escape_press ()
+WorldmapScreen::on_escape_press ()
 {
-  //std::cout << "WorldMapScreen::on_escape_press ()..." << std::endl;
+  //std::cout << "WorldmapScreen::on_escape_press ()..." << std::endl;
   exit_worldmap = true;
 }
 
 void
-WorldMapScreen::update (float delta)
+WorldmapScreen::update (float delta)
 {
   GUIScreen::update(delta);
 
@@ -288,7 +288,7 @@
 }
 
 void
-WorldMapScreen::draw_foreground(DrawingContext& gc)
+WorldmapScreen::draw_foreground(DrawingContext& gc)
 {
   // Draw the levelname
   gc.draw(levelname_bg,
@@ -300,15 +300,15 @@
 }
 
 void
-WorldMapScreen::change_map (const std::string& filename, NodeId node)
+WorldmapScreen::change_map (const std::string& filename, NodeId node)
 {
   // Create the new worldmap and make it the current one
-  new_worldmap = new WorldMap (path_manager.complete("worldmaps/" + filename));
+  new_worldmap = new Worldmap (path_manager.complete("worldmaps/" + filename));
   new_worldmap->set_pingus (node);
 }
 
 Rect
-WorldMapScreen::get_trans_rect() const
+WorldmapScreen::get_trans_rect() const
 {
   return Rect(Vector2i(Math::max((Display::get_width()  - 
worldmap->get_width())/2,  0),
                        Math::max((Display::get_height() - 
worldmap->get_height())/2, 0)), 

Modified: trunk/pingus/src/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.hpp       2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/worldmap_screen.hpp       2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -24,16 +24,16 @@
 
 class SceneContext;
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
 typedef int NodeId;
-class WorldMap;
-class WorldMapComponent;
+class Worldmap;
+class WorldmapComponent;
 
-/** The WorldMapScreen manages the worldmaps and the translation
+/** The WorldmapScreen manages the worldmaps and the translation
     between two worldmaps, it also holds the GUI elements that are
-    accessible in the WorldMap Screen */
-class WorldMapScreen : public GUIScreen
+    accessible in the Worldmap Screen */
+class WorldmapScreen : public GUIScreen
 {
 private:
   Sprite levelname_bg;
@@ -41,32 +41,32 @@
   bool is_init;
   bool exit_worldmap;
 
-  WorldMap* worldmap;
-  WorldMap* new_worldmap;
+  Worldmap* worldmap;
+  Worldmap* new_worldmap;
 
 public:
-  WorldMapScreen ();
-  ~WorldMapScreen ();
+  WorldmapScreen ();
+  ~WorldmapScreen ();
 
   void load (const std::string& filename);
 
-  /** Check if WorldMap manager still needs to run and exit if if
+  /** Check if Worldmap manager still needs to run and exit if if
       not */
   void update (float);
   void draw_foreground(DrawingContext& gc);
 
-  /** @defgroup WorldMapScreenBindings Controller bindings of the 
WorldMapScreen
+  /** @defgroup WorldmapScreenBindings Controller bindings of the 
WorldMapScreen
       @{*/
   /** Calculate the node that was clicked and set the pingu to walk
       to that node. If a node is double-cliked, the pingu should go
       faster. */
   void on_primary_button_press (int x, int y);
 
-  /** Exit the WorldMapScreen and return to the previous screen */
+  /** Exit the WorldmapScreen and return to the previous screen */
   void on_escape_press ();
   /** @}*/
 
-  WorldMap* get_worldmap() { return worldmap; }
+  Worldmap* get_worldmap() { return worldmap; }
 
   /** Change the current map to the given map
 
@@ -81,11 +81,11 @@
   /** Startup Hook of the Screen */
   void on_startup ();
 
-  WorldMapScreen (const WorldMapScreen&);
-  WorldMapScreen& operator= (const WorldMapScreen&);
+  WorldmapScreen (const WorldMapScreen&);
+  WorldmapScreen& operator= (const WorldMapScreen&);
 };
 
-} // namespace WorldMapNS
+} // namespace WorldmapNS
 
 #endif
 

Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp        2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp        2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -25,7 +25,7 @@
 #include "../fonts.hpp"
 #include "../gettext.h"
 
-WorldMapStory::WorldMapStory(const FileReader &reader)
+WorldmapStory::WorldMapStory(const FileReader &reader)
 {
   reader.read_string("title", title);
   title = _(title);
@@ -52,7 +52,7 @@
   std::reverse(pages.begin(), pages.end());
 
   if (pages.empty())
-    PingusError::raise("WorldMapStory: WorldMap does not include a valid 
story");
+    PingusError::raise("WorldmapStory: WorldMap does not include a valid 
story");
 }
 
 /* EOF */

Modified: trunk/pingus/src/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.hpp        2008-07-04 18:51:40 UTC 
(rev 3670)
+++ trunk/pingus/src/worldmap/worldmap_story.hpp        2008-07-04 18:56:33 UTC 
(rev 3671)
@@ -40,13 +40,13 @@
                std::string             page_name;
        };
 
-namespace WorldMapNS {
+namespace WorldmapNS {
 
-       class WorldMapStory
+       class WorldmapStory
        {
        public:
-               WorldMapStory(const FileReader &reader);
-               ~WorldMapStory() { }
+               WorldmapStory(const FileReader &reader);
+               ~WorldmapStory() { }
 
                std::string get_title() const { return title; }
                std::string get_music() const { return music; }
@@ -57,7 +57,7 @@
                std::string music;
                std::vector<StoryPage> pages;
 
-       };      // class WorldMapStory
+       };      // class WorldmapStory
 
 }      // namespace WorldmapNS