[Pingus-CVS] CVS: Games/Pingus/src menu_background.cxx,1.6,1.7 menu_button.cxx,1.4,1.5 pingus_main.cxx,1.52,1.53 savegame_manager.cxx,1.1,1.2 story_screen.cxx,1.5,1.6

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv23041/src

Modified Files:
        menu_background.cxx menu_button.cxx pingus_main.cxx 
        savegame_manager.cxx story_screen.cxx 
Log Message:
finished the menu background

Index: menu_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_background.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- menu_background.cxx 24 Mar 2003 11:18:53 -0000      1.6
+++ menu_background.cxx 28 Mar 2003 12:06:32 -0000      1.7
@@ -26,7 +26,7 @@
   layer_manager.add_layer (PingusResource::load_surface ("menu/layer1", 
"core"),  0, 0, 12, 0);
   layer_manager.add_layer (PingusResource::load_surface ("menu/layer2", 
"core"),  0, 150, 25, 0);
   layer_manager.add_layer (PingusResource::load_surface ("menu/layer3", 
"core"), 0, 200, 50, 0);
-  layer_manager.add_layer (PingusResource::load_surface ("menu/layer4", 
"core"), 0, 377, 100, 0);
+  layer_manager.add_layer (PingusResource::load_surface ("menu/layer4", 
"core"), 0, 600 - 171, 100, 0);
   layer_manager.add_layer (PingusResource::load_surface ("menu/layer5", 
"core"), 0, 500, 200, 0);
 }
 

Index: menu_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- menu_button.cxx     27 Mar 2003 15:57:22 -0000      1.4
+++ menu_button.cxx     28 Mar 2003 12:06:32 -0000      1.5
@@ -30,6 +30,7 @@
 #include "menu_button.hxx"
 #include "gui/screen_manager.hxx"
 #include "worldmap/manager.hxx"
+#include "story_screen.hxx"
 #include "my_gettext.hxx"
 
 using EditorNS::Editor;
@@ -360,7 +361,10 @@
 StoryButton::on_click ()
 {
   PingusSound::play_sound ("letsgo");
-  ScreenManager::instance()->push_screen(WorldMapNS::WorldMapManager::instance 
());
+  if (1 /* story_seen */)
+    ScreenManager::instance()->push_screen(new StoryScreen(), true);
+  else
+    
ScreenManager::instance()->push_screen(WorldMapNS::WorldMapManager::instance 
());
 }
 
 ThemeButton::ThemeButton (PingusMenu* menu_)

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- pingus_main.cxx     26 Mar 2003 12:01:17 -0000      1.52
+++ pingus_main.cxx     28 Mar 2003 12:06:32 -0000      1.53
@@ -588,8 +588,9 @@
   System::init_directories();
 
 #ifndef WIN32
-  std::cout << "Directory name of " << executable_name << " - " << 
System::dirname(executable_name)
-           << std::endl;
+  if (maintainer_mode)
+    std::cout << "Directory name of " << executable_name << " - " << 
System::dirname(executable_name)
+              << std::endl;
 
   // FIXME: Do we need this any longer?
   char* pingus_datadir_env = getenv ("PINGUS_DATADIR");
@@ -626,7 +627,8 @@
 #endif /* !WIN32 */
  
 #ifdef HAVE_GETTEXT
-  std::cout << "Setting gettext path to: " << path_manager.get_base_path () + 
"/../../locale" << std::endl;
+  if (maintainer_mode)
+    std::cout << "Setting gettext path to: " << path_manager.get_base_path () 
+ "/../../locale" << std::endl;
   const char* ret = setlocale (LC_ALL, "");
   if (ret == NULL)
     {
@@ -648,7 +650,7 @@
 PingusMain::print_greeting_message()
 {
   std::cout << "Welcome to Pingus "VERSION"!\n"
-            << "=========================\n" << std::endl;
+            << "=======================\n" << std::endl;
   
 #ifdef HAVE_LIBCLANVORBIS
   std::cout << "clanVorbis support: ok" << std::endl;
@@ -747,14 +749,16 @@
     }
   else // start a normal game
     {
-      //ScreenManager::instance()->push_screen (PingusMenuManager::instance 
(), false);
-      ScreenManager::instance()->push_screen (new StoryScreen(), true);
+      ScreenManager::instance()->push_screen (PingusMenuManager::instance (), 
false);
+      //ScreenManager::instance()->push_screen (new StoryScreen(), true);
     }
 
   // show the main menu, the rest of the game is spawn from there
-  std::cout << "PingusMain::start screen manager" << std::endl;
+  if (maintainer_mode)
+    std::cout << "PingusMain::start screen manager" << std::endl;
   ScreenManager::instance ()->display ();
-  std::cout << "PingusMain::quit game and screen_manager" << std::endl;
+  if (maintainer_mode)
+    std::cout << "PingusMain::quit game and screen_manager" << std::endl;
   
   // unregister the global event catcher
   CL_Input::sig_button_press ().disconnect (on_button_press_slot);
@@ -848,7 +852,9 @@
   CL_Display::set_videomode(screen_width, screen_height, 16, 
                            fullscreen_enabled, 
                            false); // allow resize
-
+  CL_Display::clear_display();
+  CL_Display::flip_display();
+  
 #ifdef HAVE_LIBCLANGL
   if (use_opengl)
     {

Index: savegame_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame_manager.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- savegame_manager.cxx        26 Mar 2003 12:01:17 -0000      1.1
+++ savegame_manager.cxx        28 Mar 2003 12:06:32 -0000      1.2
@@ -75,7 +75,7 @@
                     }
                   else
                     {
-                      std::cout << "SavegameManager: Loading savegame for: " 
<< savegame->levelname << std::endl;
+                      //std::cout << "SavegameManager: Loading savegame for: " 
<< savegame->levelname << std::endl;
                       savegames[savegame->levelname] = savegame;
                     }
                 }

Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- story_screen.cxx    25 Mar 2003 23:15:22 -0000      1.5
+++ story_screen.cxx    28 Mar 2003 12:06:32 -0000      1.6
@@ -29,6 +29,7 @@
 #include "fonts.hxx"
 #include "story_screen.hxx"
 #include "res_descriptor.hxx"
+#include "worldmap/manager.hxx"
 #include "sound/sound.hxx"
 
 class StoryPage
@@ -173,7 +174,8 @@
 void
 StoryScreen::on_escape_press ()
 {
-  ScreenManager::instance()->replace_screen (PingusMenuManager::instance (), 
false);
+  if (1 /* story_seen */)
+    
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance 
());
 }
 
 void 
@@ -204,7 +206,8 @@
       else
         {
           std::cout << "StoryScreenComponent: Out of story pages" << std::endl;
-          ScreenManager::instance()->replace_screen 
(PingusMenuManager::instance (), false);
+          //ScreenManager::instance()->replace_screen 
(PingusMenuManager::instance (), false);
+          
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance 
());
         }
     }
 }