[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.43,1.44 pingus_menu.cxx,1.11,1.12 pingus_menu_manager.cxx,1.17,1.18 pingus_menu_manager.hxx,1.16,1.17

[grumbel]

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

Modified Files:
        pingus_main.cxx pingus_menu.cxx pingus_menu_manager.cxx 
        pingus_menu_manager.hxx 
Log Message:
- added keep_aspect to surface backgrounds
- fixed anim bug in liquid


Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- pingus_main.cxx     18 Feb 2003 15:04:47 -0000      1.43
+++ pingus_main.cxx     18 Feb 2003 17:04:13 -0000      1.44
@@ -292,15 +292,6 @@
 #endif
 
     case 's': // -s, --enable-sound
-      if (verbose) std::cout << "check_args: Sound Effects enabled" << 
std::endl;
-      std::cout <<
-       _("\n"
-         "=================================================================\n"
-         "                            WARNING!                             \n"
-         "=================================================================\n"
-         "Be warned, at the moment there is only some sound code pressent, \n"
-         "there are *no* sound files, so this will fail.\n"
-         
"=================================================================\n") << 
std::endl;
       sound_enabled = true;
       break;
     case 'g':

Index: pingus_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingus_menu.cxx     18 Feb 2003 15:04:47 -0000      1.11
+++ pingus_menu.cxx     18 Feb 2003 17:04:13 -0000      1.12
@@ -19,7 +19,6 @@
 
 #include "surface_button.hxx"
 #include "pingus_resource.hxx"
-#include "sound/sound.hxx"
 #include "debug.hxx"
 #include "pingus_menu_manager.hxx"
 #include "gui/gui_manager.hxx"
@@ -51,10 +50,6 @@
       gui_manager->add(new StoryButton(this));
       gui_manager->add(editor_button);
     }
-
-  // FIXME: Preload is probally the wrong place for this, there should
-  // be show_hook and remove_hook
-  PingusSound::play_music("../data/music/pingus-1.it");
 }
 
 PingusMenu::~PingusMenu()

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pingus_menu_manager.cxx     5 Nov 2002 03:02:48 -0000       1.17
+++ pingus_menu_manager.cxx     18 Feb 2003 17:04:13 -0000      1.18
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <ClanLib/Display/Display/display.h>
 #include "screen_manager.hxx"
+#include "sound/sound.hxx"
 #include "pingus_menu_manager.hxx"
 
 PingusMenuManager* PingusMenuManager::instance_ = 0;
@@ -143,6 +144,12 @@
 {
   std::cout << "poping PingusMenuManager" << std::endl;
   ScreenManager::instance ()->pop_screen ();
+}
+
+void
+PingusMenuManager::on_startup()
+{
+  PingusSound::play_music("../data/music/pingus-1.it");
 }
 
 PingusMenuManager*

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pingus_menu_manager.hxx     5 Nov 2002 03:02:48 -0000       1.16
+++ pingus_menu_manager.hxx     18 Feb 2003 17:04:13 -0000      1.17
@@ -85,6 +85,8 @@
       dialoges and such things.*/
   void push_menu (PingusSubMenu * menu);
 
+  void on_startup();
+
   static PingusMenuManager* instance ();
   static void init();
   static void deinit();