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

[jsalmon3]

Author: jsalmon3
Date: 2007-08-05 07:22:18 +0200 (Sun, 05 Aug 2007)
New Revision: 2810

Modified:
   branches/pingus_sdl/src/pingus_level.cpp
   branches/pingus_sdl/src/sexpr_file_reader.cpp
   branches/pingus_sdl/src/worldmap/manager.cpp
Log:
Moved some messages to debug only, enabled credits screen

Modified: branches/pingus_sdl/src/pingus_level.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_level.cpp    2007-08-05 03:21:01 UTC (rev 
2809)
+++ branches/pingus_sdl/src/pingus_level.cpp    2007-08-05 05:22:18 UTC (rev 
2810)
@@ -22,6 +22,8 @@
 #include "pingus_level.hpp"
 #include "pingus_error.hpp"
 #include "pingus_level_impl.hpp"
+#include "globals.hpp"
+#include "debug.hpp"
 
 PingusLevel::PingusLevel()
   : impl(new PingusLevelImpl())  
@@ -44,9 +46,9 @@
     {
       int version;
       if (reader.read_int("version", version))
-        std::cout << "Levelfile Version: " << version << std::endl;
+        pout(PINGUS_DEBUG_LOADING) << "Levelfile Version: " << version << 
std::endl;
       else
-        std::cout << "Unknown Levelfile Version: " << version << std::endl;
+        pout(PINGUS_DEBUG_LOADING) << "Unknown Levelfile Version: " << version 
<< std::endl;
 
       FileReader head;
       if (!reader.read_section("head", head))
@@ -55,7 +57,7 @@
         }
       else
         {
-          std::cout << "Reading head" << std::endl;
+          pout(PINGUS_DEBUG_LOADING) << "Reading head" << std::endl;
           head.read_string("levelname",        impl->levelname);
           head.read_string("description",      impl->description);
           head.read_size  ("levelsize",        impl->size);
@@ -67,7 +69,7 @@
           head.read_color ("ambient-light",    impl->ambient_light);
           head.read_string("author",           impl->author);
 
-          std::cout << "Size: " << impl->size.width << " " << 
impl->size.height << std::endl;
+          pout(PINGUS_DEBUG_LOADING) << "Size: " << impl->size.width << " " << 
impl->size.height << std::endl;
           
           FileReader actions;
           if (head.read_section("actions", actions))
@@ -76,7 +78,7 @@
               for(std::vector<std::string>::iterator i = lst.begin(); i != 
lst.end(); ++i)
                 {
                   int count = 0;
-                  std::cout << "Actions: " << i->c_str() << std::endl;
+                  pout(PINGUS_DEBUG_LOADING) << "Actions: " << i->c_str() << 
std::endl;
                   if (actions.read_int(i->c_str(), count))
                     impl->actions[*i] = count;
                 }

Modified: branches/pingus_sdl/src/sexpr_file_reader.cpp
===================================================================
--- branches/pingus_sdl/src/sexpr_file_reader.cpp       2007-08-05 03:21:01 UTC 
(rev 2809)
+++ branches/pingus_sdl/src/sexpr_file_reader.cpp       2007-08-05 05:22:18 UTC 
(rev 2810)
@@ -226,7 +226,6 @@
       { // iterate over subsections
        boost::shared_ptr<lisp::Lisp> sub = sexpr->get_list_elem(i);
         lst.push_back(sub->get_list_elem(0)->get_symbol());
-        std::cout << sub->get_list_elem(0)->get_symbol() << std::endl;
       }
 
     return lst;

Modified: branches/pingus_sdl/src/worldmap/manager.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/manager.cpp        2007-08-05 03:21:01 UTC 
(rev 2809)
+++ branches/pingus_sdl/src/worldmap/manager.cpp        2007-08-05 05:22:18 UTC 
(rev 2810)
@@ -107,10 +107,8 @@
 void
 WorldMapManagerCreditsButton::on_click()
 {
-#if 0
   ScreenManager::instance()->replace_screen
     (new 
StoryScreen(WorldMapManager::instance()->get_worldmap()->get_end_story()), 
true);
-#endif
 }
 
 WorldMapManagerStoryButton::WorldMapManagerStoryButton()