[Pingus-CVS] CVS: Games/Pingus/src credits.cxx,1.18,1.19 globals.cxx,1.7,1.8 pingus_main.cxx,1.68,1.69 story_screen.cxx,1.13,1.14

[grumbel]

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

Modified Files:
        credits.cxx globals.cxx pingus_main.cxx story_screen.cxx 
Log Message:
- integrated credits after end story

Index: credits.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/credits.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- credits.cxx 9 Apr 2003 23:35:28 -0000       1.18
+++ credits.cxx 9 Apr 2003 23:57:03 -0000       1.19
@@ -115,6 +115,7 @@
   credits.push_back("_Mattias Andersson");
   credits.push_back("_Michael Wand");
   credits.push_back("_Peter Todd");
+  credits.push_back("_Peter van Rossum");
   credits.push_back("_Richard Stallman");
   credits.push_back("_Rob Gietema");
   credits.push_back("_Robert Wittams");
@@ -231,8 +232,8 @@
 void
 Credits::on_startup ()
 {
-  offset = CL_Display::get_height() + 50;
-  PingusSound::play_music("pingus-2.it");
+  offset = CL_Display::get_height();
+  //PingusSound::play_music("pingus-5.it");
 }
 
 Credits*

Index: globals.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/globals.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- globals.cxx 21 Mar 2003 22:08:06 -0000      1.7
+++ globals.cxx 9 Apr 2003 23:57:03 -0000       1.8
@@ -38,7 +38,11 @@
 bool        start_editor                    = false;
 bool        auto_scrolling                  = true;
 int         tile_size                       = 32;
+#ifdef WIN32
+bool        fullscreen_enabled              = true;
+#else
 bool        fullscreen_enabled              = false;
+#endif
 int         screen_width                    = 800;
 int         screen_height                   = 600;
 bool        preload_data                    = false; // FIXME: Should be 
default if it would work

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- pingus_main.cxx     9 Apr 2003 23:35:28 -0000       1.68
+++ pingus_main.cxx     9 Apr 2003 23:57:03 -0000       1.69
@@ -526,7 +526,7 @@
                 << std::endl;
 #endif
       std::cout <<
-       _("   -w, --window             Start in Window Mode (default)\n"
+       _("   -w, --window             Start in Window Mode\n"
           "   -f, --fullscreen         Start in Fullscreen\n"
           "   -d, --datadir PATH       Set the path to load the data files to 
`path'\n"
           "   --use-datafile           Use the pre-compiled datafile 
(default)\n"

Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- story_screen.cxx    6 Apr 2003 12:40:47 -0000       1.13
+++ story_screen.cxx    9 Apr 2003 23:57:03 -0000       1.14
@@ -34,11 +34,14 @@
 #include "worldmap/manager.hxx"
 #include "stat_manager.hxx"
 #include "story.hxx"
+#include "credits.hxx"
 #include "sound/sound.hxx"
 
 class StoryScreenComponent : public GUI::Component
 {
 private:
+  bool show_credits;
+
   CL_Surface background;
   std::string display_text;
   float time_passed;
@@ -101,6 +104,11 @@
 StoryScreenComponent::StoryScreenComponent (const Story& arg_story)
   : story(arg_story)
 {
+  if (&arg_story == &Story::credits)
+    show_credits = true;
+  else
+    show_credits = false;
+
   page_displayed_completly = false;
   time_passed  = 0;
 
@@ -177,10 +185,13 @@
         }
       else
         {
-          std::cout << "StoryScreenComponent: Out of story pages" << std::endl;
+          //std::cout << "StoryScreenComponent: Out of story pages" << 
std::endl;
           StatManager::instance()->set_bool("story-seen", true);
           //ScreenManager::instance()->replace_screen 
(PingusMenuManager::instance (), false);
-          
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance 
());
+          if (show_credits)
+            ScreenManager::instance()->replace_screen(Credits::instance(), 
false);
+          else
+            
ScreenManager::instance()->replace_screen(WorldMapNS::WorldMapManager::instance 
());
         }
     }
 }