[Pingus-CVS] r2690 - in branches/pingus_sdl/src: . worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2007-01-18 13:53:19 +0100 (Thu, 18 Jan 2007)
New Revision: 2690

Modified:
   branches/pingus_sdl/src/pingus_main.cpp
   branches/pingus_sdl/src/resource_modifier.hpp
   branches/pingus_sdl/src/worldmap/level_dot.cpp
   branches/pingus_sdl/src/worldmap/worldmap.cpp
Log:
- some cleanup

Modified: branches/pingus_sdl/src/pingus_main.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_main.cpp     2007-01-18 12:30:57 UTC (rev 
2689)
+++ branches/pingus_sdl/src/pingus_main.cpp     2007-01-18 12:53:19 UTC (rev 
2690)
@@ -829,10 +829,6 @@
         }
     }
 
-  ////catch (const CL_Error& err) {
-  ////std::cout << _("Error caught from ClanLib: ") << err.message << 
std::endl;
-////}
-
   catch (const PingusError& err) {
     std::cout << _("Error caught from Pingus: ") << err.get_message () << 
std::endl;
   }

Modified: branches/pingus_sdl/src/resource_modifier.hpp
===================================================================
--- branches/pingus_sdl/src/resource_modifier.hpp       2007-01-18 12:30:57 UTC 
(rev 2689)
+++ branches/pingus_sdl/src/resource_modifier.hpp       2007-01-18 12:53:19 UTC 
(rev 2690)
@@ -42,8 +42,6 @@
 ResourceModifier rotate_90 (ResourceModifier);
 ResourceModifier rotate_270 (ResourceModifier);
 
-// we don't specialize the CL_String::to templates here, since the enum
-// might get confused with 'int'
 std::string rs_to_string (ResourceModifier);
 ResourceModifier rs_from_string (const std::string&);
 

Modified: branches/pingus_sdl/src/worldmap/level_dot.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/level_dot.cpp      2007-01-18 12:30:57 UTC 
(rev 2689)
+++ branches/pingus_sdl/src/worldmap/level_dot.cpp      2007-01-18 12:53:19 UTC 
(rev 2690)
@@ -105,8 +105,8 @@
 LevelDot::on_click()
 {
   std::cout << "Starting level: " << levelname << std::endl;
-  ////ScreenManager::instance()->push_screen(new StartScreen(plf),
-  ////true);
+  ScreenManager::instance()->push_screen(new StartScreen(plf),
+                                         true);
 }
 
 bool

Modified: branches/pingus_sdl/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cpp       2007-01-18 12:30:57 UTC 
(rev 2689)
+++ branches/pingus_sdl/src/worldmap/worldmap.cpp       2007-01-18 12:53:19 UTC 
(rev 2690)
@@ -402,7 +402,7 @@
           if (dot->finished())
             {
               
////WorldMapManager::instance()->get_metamap()->finish_node(short_name);
-              ////ScreenManager::instance()->replace_screen(new 
StoryScreen(get_end_story()), true);
+              ScreenManager::instance()->replace_screen(new 
StoryScreen(get_end_story()), true);
             }
         }
       else