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

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-04 09:08:47 +0200 (Fri, 04 Jul 2008)
New Revision: 3665

Removed:
   trunk/pingus/src/worldmap/world_dot.cpp
   trunk/pingus/src/worldmap/world_dot.hpp
Modified:
   trunk/pingus/SConstruct
   trunk/pingus/src/worldmap/dot_factory.cpp
   trunk/pingus/src/worldmap/manager.cpp
   trunk/pingus/src/worldmap/manager.hpp
   trunk/pingus/src/worldmap/path_graph.cpp
   trunk/pingus/src/worldmap/worldmap.cpp
Log:
Some more cleanup of old cruft

Modified: trunk/pingus/SConstruct
===================================================================
--- trunk/pingus/SConstruct     2008-07-04 07:04:22 UTC (rev 3664)
+++ trunk/pingus/SConstruct     2008-07-04 07:08:47 UTC (rev 3665)
@@ -257,7 +257,6 @@
 'src/worldmap/pingus.cpp', 
 'src/worldmap/sprite_drawable.cpp', 
 'src/worldmap/surface_drawable.cpp', 
-'src/worldmap/world_dot.cpp', 
 'src/worldmap/worldmap.cpp', 
 'src/worldmap/worldmap_story.cpp', 
 'src/worldobj.cpp', 

Modified: trunk/pingus/src/worldmap/dot_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.cpp   2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/dot_factory.cpp   2008-07-04 07:08:47 UTC (rev 
3665)
@@ -16,7 +16,6 @@
 
 #include "../pingus_error.hpp"
 #include "level_dot.hpp"
-#include "world_dot.hpp"
 #include "dot_factory.hpp"
 
 namespace WorldMapNS {
@@ -24,20 +23,15 @@
 Dot*
 DotFactory::create(FileReader reader)
 {
-       if (reader.get_name() == "leveldot")
-       {
-               return new LevelDot(reader);
-       }
-       else if (reader.get_name() == "worlddot")
-       {
-               return new WorldDot(reader);
-       }
-       //else if (reader.get_name() == "tubedot")
-       else
-       {
-               PingusError::raise("DotFactory: unknown tag: ");
-       }
-       return 0;
+  if (reader.get_name() == "leveldot")
+    {
+      return new LevelDot(reader);
+    }
+  else if (reader.get_name() == "tubedot")
+    {
+      PingusError::raise("DotFactory: unknown tag: ");
+    }
+  return 0;
 }
 
 } // namespace WorldMapNS

Modified: trunk/pingus/src/worldmap/manager.cpp
===================================================================
--- trunk/pingus/src/worldmap/manager.cpp       2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/manager.cpp       2008-07-04 07:08:47 UTC (rev 
3665)
@@ -214,8 +214,7 @@
   : levelname_bg(Sprite("core/worldmap/levelname_bg")),
     is_init(false),
     exit_worldmap(false),
-    worldmap(0),
-    new_worldmap(0)
+    worldmap(0)
 {
   // FIXME: a bit ugly because of the proteced member, but should work
   // FIXME: well enough. GUIScreen could also use multi-inheritage,
@@ -259,7 +258,6 @@
 {
   delete worldmap;
   delete new_worldmap;
-  ////delete metamap;
 }
 
 void

Modified: trunk/pingus/src/worldmap/manager.hpp
===================================================================
--- trunk/pingus/src/worldmap/manager.hpp       2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/manager.hpp       2008-07-04 07:08:47 UTC (rev 
3665)
@@ -71,8 +71,6 @@
   WorldMap* worldmap;
   WorldMap* new_worldmap;
 
-  //MetaMap* metamap;
-
   WorldMapManager ();
 public:
   ~WorldMapManager ();
@@ -96,7 +94,6 @@
   /** @}*/
 
   WorldMap* get_worldmap() { return worldmap; }
-  //// MetaMap* get_metamap() { return metamap; }
 
   /** Change the current map to the given map
 

Modified: trunk/pingus/src/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp    2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/path_graph.cpp    2008-07-04 07:08:47 UTC (rev 
3665)
@@ -30,7 +30,6 @@
 
 PathGraph::PathGraph(WorldMap* arg_worldmap, FileReader &reader)
   : worldmap(arg_worldmap)
-                    ////metamap(0)
 {
   parse_nodes(reader.read_section("nodes"));
   parse_edges(reader.read_section("edges"));

Deleted: trunk/pingus/src/worldmap/world_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/world_dot.cpp     2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/world_dot.cpp     2008-07-04 07:08:47 UTC (rev 
3665)
@@ -1,42 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2006 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//  
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//  
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "world_dot.hpp"
-#include "../stat_manager.hpp"
-#include "../file_reader.hpp"
-
-namespace WorldMapNS {
-
-WorldDot::WorldDot(FileReader reader) :
-       Dot(reader.read_section("dot")),
-       is_accessible(false),
-       is_finished(false)
-{
-       // Get the status from the StatManger
-       StatManager::instance()->get_bool(name + "-accessible", is_accessible);
-       StatManager::instance()->get_bool(name + "-finished", is_finished);
-}
-
-void
-WorldDot::unlock()
-{
-       is_accessible = true;
-       StatManager::instance()->set_bool(name + "-accessible", true);
-}
-
-}      // WorldMapNS namespace
-
-/* EOF */

Deleted: trunk/pingus/src/worldmap/world_dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/world_dot.hpp     2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/world_dot.hpp     2008-07-04 07:08:47 UTC (rev 
3665)
@@ -1,58 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 2006 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//  
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//  
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_PINGUS_WORLDMAP_WORLD_DOT_HPP
-#define HEADER_PINGUS_WORLDMAP_WORLD_DOT_HPP
-
-#include "dot.hpp"
-
-namespace WorldMapNS {
-
-/** Represents a WorldMap dot on a MetaMap */
-class WorldDot : public Dot
-{
-private:
-       bool is_accessible;
-       bool is_finished;
-
-public:
-  WorldDot(FileReader reader);
-
-  /** Draw stuff that should be displayed if the mouse is over the dot */
-       virtual void draw_hover(DrawingContext& gc) { UNUSED_ARG(gc); }
-       virtual void draw(DrawingContext& gc) { UNUSED_ARG(gc); }
-       virtual void update(float delta) { UNUSED_ARG(delta); }
-
-  Vector3f get_pos() { return pos; }
-
-       virtual void on_click() { }
-
-       virtual bool finished() { return is_finished; }
-       virtual bool accessible() { return is_accessible; }
-
-  /** makes the node accessible */
-       virtual void unlock();
-
-private:
-  WorldDot (const WorldDot&);
-  WorldDot& operator= (const WorldDot&);
-}; // WorldDot class
-
-}      // WorldMapNS namespace
-
-#endif
-
-/* EOF */

Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp      2008-07-04 07:04:22 UTC (rev 
3664)
+++ trunk/pingus/src/worldmap/worldmap.cpp      2008-07-04 07:08:47 UTC (rev 
3665)
@@ -362,7 +362,6 @@
         {
           if (dot->finished())
             {
-              
////WorldMapManager::instance()->get_metamap()->finish_node(short_name);
               ScreenManager::instance()->replace_screen(new 
StoryScreen(get_end_story()), true);
             }
         }
@@ -402,7 +401,6 @@
 WorldMap::is_final_map()
 {
   return pingus->get_node() == final_node;
-////  return (WorldMapManager::instance()->get_metamap()->get_final_worldmap() 
== short_name);
 }
 
 std::string