[Pingus-CVS] r3669 - trunk/pingus/src/worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-04 11:37:23 +0200 (Fri, 04 Jul 2008)
New Revision: 3669

Modified:
   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
Log:
Some more cleanup

Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp    2008-07-04 08:51:09 UTC 
(rev 3668)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp    2008-07-04 09:37:23 UTC 
(rev 3669)
@@ -23,20 +23,20 @@
 namespace WorldMapNS {
 
 WorldMapComponent::WorldMapComponent(WorldMapScreen* worldmap_screen)
-  : worldmap_screen(worldmap_screen)
+  : scene_context(new SceneContext()),
+    worldmap_screen(worldmap_screen)
+    
 {
-  scene_context = new SceneContext();
 }
 
 WorldMapComponent::~WorldMapComponent()
 {
-  delete scene_context;
 }
 
 void
 WorldMapComponent::draw (DrawingContext& gc)
 {
-  WorldMap* worldmap = worldmap_screen->worldmap;
+  WorldMap* worldmap = worldmap_screen->get_worldmap();
 
   Rect cliprect = worldmap_screen->get_trans_rect();
 
@@ -49,7 +49,7 @@
   //scene_context->color().draw_fillrect(-100, -100, 2000, 2000, 
Color(255,0,0,0), -10000);
   worldmap->draw(scene_context->color());
 
-  gc.draw(new SceneContextDrawingRequest(scene_context, Vector3f(0,0,-1000)));
+  gc.draw(new SceneContextDrawingRequest(scene_context.get(), 
Vector3f(0,0,-1000)));
 
   scene_context->pop_modelview();
 
@@ -75,7 +75,7 @@
 void
 WorldMapComponent::update (float delta)
 {
-  worldmap_screen->worldmap->update(delta);
+  worldmap_screen->get_worldmap()->update(delta);
 }
 
 
@@ -83,7 +83,7 @@
 WorldMapComponent::on_primary_button_press (int x, int y)
 {
   Rect cliprect = worldmap_screen->get_trans_rect();
-  worldmap_screen->worldmap->on_primary_button_press(x - cliprect.left,
+  worldmap_screen->get_worldmap()->on_primary_button_press(x - cliprect.left,
                                                      y - cliprect.top);
 }
 
@@ -92,7 +92,7 @@
 WorldMapComponent::on_pointer_move (int x, int y)
 {
   Rect cliprect = worldmap_screen->get_trans_rect();
-  worldmap_screen->worldmap->on_pointer_move(x - cliprect.left,
+  worldmap_screen->get_worldmap()->on_pointer_move(x - cliprect.left,
                                              y - cliprect.top);
 }
 
@@ -100,7 +100,7 @@
 WorldMapComponent::on_secondary_button_press (int x, int y)
 {
   Rect cliprect = worldmap_screen->get_trans_rect();
-  worldmap_screen->worldmap->on_secondary_button_press(x - cliprect.left,
+  worldmap_screen->get_worldmap()->on_secondary_button_press(x - cliprect.left,
                                                        y - cliprect.top);
 }
 

Modified: trunk/pingus/src/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.hpp    2008-07-04 08:51:09 UTC 
(rev 3668)
+++ trunk/pingus/src/worldmap/worldmap_component.hpp    2008-07-04 09:37:23 UTC 
(rev 3669)
@@ -18,6 +18,7 @@
 #define HEADER_WORLDMAP_COMPONENT_HPP
 
 #include <string>
+#include <memory>
 #include "../gui/gui_manager.hpp"
 
 class SceneContext;
@@ -30,7 +31,7 @@
 class WorldMapComponent : public GUI::Component
 {
 private:
-  SceneContext*   scene_context;
+  std::auto_ptr<SceneContext> scene_context;
   WorldMapScreen* worldmap_screen;
   
 public:

Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-04 08:51:09 UTC 
(rev 3668)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-04 09:37:23 UTC 
(rev 3669)
@@ -33,8 +33,6 @@
 #include "pingus.hpp"
 #include "../story_screen.hpp"
 #include "worldmap_screen.hpp"
-
-WorldMapScreen* WorldMapScreen::instance_ = 0;
 
 class WorldMapScreenCloseButton
   : public GUI::SurfaceButton
@@ -225,8 +223,7 @@
   // 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
-  worldmap_component = new WorldMapComponent(this);
-  gui_manager->add (worldmap_component, 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);

Modified: trunk/pingus/src/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.hpp       2008-07-04 08:51:09 UTC 
(rev 3668)
+++ trunk/pingus/src/worldmap/worldmap_screen.hpp       2008-07-04 09:37:23 UTC 
(rev 3669)
@@ -35,12 +35,7 @@
     accessible in the WorldMap Screen */
 class WorldMapScreen : public GUIScreen
 {
-  WorldMapComponent* worldmap_component;
-
-  friend class WorldMapComponent;
 private:
-  static WorldMapScreen* instance_;
-
   Sprite levelname_bg;
 
   bool is_init;