[Pingus-CVS] CVS: Games/Pingus/src screen.hxx,1.5,1.6 screen_manager.cxx,1.7,1.8 xml_helper.cxx,1.8,1.9

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv12427

Modified Files:
        screen.hxx screen_manager.cxx xml_helper.cxx 
Log Message:
some cleanup

Index: screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screen.hxx  2 Aug 2002 11:25:47 -0000       1.5
+++ screen.hxx  4 Aug 2002 19:57:15 -0000       1.6
@@ -40,7 +40,8 @@
       screen */
   virtual void on_startup () {}
 
-  /** Called once the screen gets replaced */ 
+  /** Called once the screen gets replaced or poped or shadowed by a
+      newly pushed screen */ 
   virtual void on_shutdown () {}
 };
 

Index: screen_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen_manager.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- screen_manager.cxx  4 Aug 2002 15:42:23 -0000       1.7
+++ screen_manager.cxx  4 Aug 2002 19:57:15 -0000       1.8
@@ -106,6 +106,14 @@
 void
 ScreenManager::push_screen (Screen* screen, bool delete_screen)
 {
+  std::cout << "XXXXXXXX ScreenManager::push_screen" << std::endl;
+  
+  if (!screens.empty())
+    {
+      std::cout << "ScreenManager::push_screen" << std::endl;
+      screens.back ().first->on_shutdown ();
+    }
+
   screen->on_startup ();
   screens.push_back (std::pair<Screen*, bool> (screen, delete_screen));
 }
@@ -128,6 +136,8 @@
 void
 ScreenManager::real_replace_screen (Screen* screen, bool delete_screen)
 {
+  std::cout << "XXXXXXXX ScreenManager::replace_screen" << std::endl;
+
   screens.back ().first->on_shutdown ();
 
   if (screens.back ().second) // delete_screen
@@ -140,6 +150,8 @@
 void
 ScreenManager::real_pop_screen ()
 {
+  std::cout << "XXXXXXXX ScreenManager::pop_screen" << std::endl;
+
   screens.back ().first->on_shutdown ();
 
   if (screens.back ().second) // delete_screen

Index: xml_helper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_helper.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xml_helper.cxx      28 Jun 2002 17:48:42 -0000      1.8
+++ xml_helper.cxx      4 Aug 2002 19:57:15 -0000       1.9
@@ -202,7 +202,7 @@
                      char* ident = (char*)xmlNodeListGetString(doc, 
ccur->children, 1);
                      if (ident) 
                        {
-                         std::cout << "Seen: modifier: " << ident << std::endl;
+                         //std::cout << "Seen: modifier: " << ident << 
std::endl;
 
                          desc.modifier = rs_from_string(ident);
                          free(ident);
@@ -255,11 +255,11 @@
                    }
                  else if (strcmp((char*)ccur->name, "modifier") == 0)
                    {
-                     std::cout << "Modifier!!!!!" << std::endl;
+                     //std::cout << "Modifier!!!!!" << std::endl;
                      char* ident = (char*)xmlNodeListGetString(doc, 
ccur->children, 1);
                      if (ident) 
                        {
-                         std::cout << "Seen: modifier: " << ident << std::endl;
+                         //std::cout << "Seen: modifier: " << ident << 
std::endl;
                      
                          desc.modifier = rs_from_string(ident);
                          free(ident);