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

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-04 20:58:36 +0200 (Fri, 04 Jul 2008)
New Revision: 3672

Modified:
   trunk/pingus/src/pingus_menu.cpp
   trunk/pingus/src/story_screen.cpp
   trunk/pingus/src/worldmap/worldmap.cpp
   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
Log:
Renamed WorldMap to Worldmap

Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp    2008-07-04 18:56:33 UTC (rev 3671)
+++ trunk/pingus/src/pingus_menu.cpp    2008-07-04 18:58:36 UTC (rev 3672)
@@ -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:56:33 UTC (rev 3671)
+++ trunk/pingus/src/story_screen.cpp   2008-07-04 18:58:36 UTC (rev 3672)
@@ -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;
@@ -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/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp      2008-07-04 18:56:33 UTC (rev 
3671)
+++ trunk/pingus/src/worldmap/worldmap.cpp      2008-07-04 18:58:36 UTC (rev 
3672)
@@ -49,9 +49,9 @@
 
 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)
     {

Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp    2008-07-04 18:56:33 UTC 
(rev 3671)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp    2008-07-04 18:58:36 UTC 
(rev 3672)
@@ -22,14 +22,14 @@
 
 namespace WorldmapNS {
 
-WorldmapComponent::WorldMapComponent(WorldMapScreen* worldmap_screen)
+WorldmapComponent::WorldmapComponent(WorldmapScreen* worldmap_screen)
   : scene_context(new SceneContext()),
     worldmap_screen(worldmap_screen)
     
 {
 }
 
-WorldmapComponent::~WorldMapComponent()
+WorldmapComponent::~WorldmapComponent()
 {
 }
 

Modified: trunk/pingus/src/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.hpp    2008-07-04 18:56:33 UTC 
(rev 3671)
+++ trunk/pingus/src/worldmap/worldmap_component.hpp    2008-07-04 18:58:36 UTC 
(rev 3672)
@@ -35,7 +35,7 @@
   WorldmapScreen* worldmap_screen;
   
 public:
-  WorldmapComponent(WorldMapScreen* worldmap_screen);
+  WorldmapComponent(WorldmapScreen* worldmap_screen);
   ~WorldmapComponent();
 
   void on_primary_button_press (int x, int y);
@@ -48,8 +48,8 @@
   bool is_at (int, int) { return true; }
 
 private:
-  WorldmapComponent (const WorldMapComponent&);
-  WorldmapComponent& operator= (const WorldMapComponent&);
+  WorldmapComponent (const WorldmapComponent&);
+  WorldmapComponent& operator= (const WorldmapComponent&);
 };
 
 } // namespace WorldmapNS

Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-04 18:56:33 UTC 
(rev 3671)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-04 18:58:36 UTC 
(rev 3672)
@@ -40,7 +40,7 @@
 private: 
   WorldmapScreen* worldmap_screen;
 public:
-  WorldmapScreenCloseButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenCloseButton(WorldmapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
@@ -52,7 +52,7 @@
 private:
   WorldmapScreen* worldmap_screen;
 public:
-  WorldmapScreenStoryButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenStoryButton(WorldmapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
@@ -64,7 +64,7 @@
 private:
   WorldmapScreen* worldmap_screen;
 public:
-  WorldmapScreenCreditsButton(WorldMapScreen* worldmap_screen);
+  WorldmapScreenCreditsButton(WorldmapScreen* worldmap_screen);
   void on_click();
   void draw (DrawingContext& gc);
   void on_pointer_enter();
@@ -76,13 +76,13 @@
 private:
   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"),
@@ -112,7 +112,7 @@
     (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"),
@@ -142,7 +142,7 @@
     (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"),
@@ -171,7 +171,7 @@
   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"),
@@ -213,7 +213,7 @@
   worldmap_screen->get_worldmap()->enter_level();
 }
 
-WorldmapScreen::WorldMapScreen ()
+WorldmapScreen::WorldmapScreen ()
   : levelname_bg(Sprite("core/worldmap/levelname_bg")),
     is_init(false),
     exit_worldmap(false),
@@ -256,7 +256,7 @@
     worldmap->on_startup ();
 }
 
-WorldmapScreen::~WorldMapScreen ()
+WorldmapScreen::~WorldmapScreen ()
 {
   delete worldmap;
   delete new_worldmap;

Modified: trunk/pingus/src/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.hpp       2008-07-04 18:56:33 UTC 
(rev 3671)
+++ trunk/pingus/src/worldmap/worldmap_screen.hpp       2008-07-04 18:58:36 UTC 
(rev 3672)
@@ -55,7 +55,7 @@
   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
@@ -81,8 +81,8 @@
   /** Startup Hook of the Screen */
   void on_startup ();
 
-  WorldmapScreen (const WorldMapScreen&);
-  WorldmapScreen& operator= (const WorldMapScreen&);
+  WorldmapScreen (const WorldmapScreen&);
+  WorldmapScreen& operator= (const WorldmapScreen&);
 };
 
 } // namespace WorldmapNS

Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp        2008-07-04 18:56:33 UTC 
(rev 3671)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp        2008-07-04 18:58:36 UTC 
(rev 3672)
@@ -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 */