[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.131,1.132 client.cxx,1.38,1.39 credits.cxx,1.13,1.14 level_result.cxx,1.6,1.7 pingu.cxx,1.37,1.38 pingus_main.cxx,1.42,1.43 pingus_main.hxx,1.6,1.7 pingus_menu.cxx,1.10,1.11 surface_button.cxx,1.18,1.19 theme_selector.cxx,1.7,1.8 world.cxx,1.36,1.37 specs_reader.cxx,1.4,NONE specs_reader.hxx,1.5,NONE

[grumbel]

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

Modified Files:
        Makefile.am client.cxx credits.cxx level_result.cxx pingu.cxx 
        pingus_main.cxx pingus_main.hxx pingus_menu.cxx 
        surface_button.cxx theme_selector.cxx world.cxx 
Removed Files:
        specs_reader.cxx specs_reader.hxx 
Log Message:
- moved sound stuff into its own subdirectory
- fixed memory hole in sound code, another one is still there


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- Makefile.am 18 Feb 2003 00:15:32 -0000      1.131
+++ Makefile.am 18 Feb 2003 15:04:47 -0000      1.132
@@ -34,6 +34,7 @@
         input               \
        movers              \
        particles           \
+       sound               \
         worldobjs           \
        worldobjsdata       \
        worldmap
@@ -64,6 +65,7 @@
        colliders/libpingus_colliders.a \
         editor/libpingus_editor.a       \
         particles/libpingus_particle.a  \
+        sound/libpingus_sound.a  \
         worldmap/libpingus_worldmap.a \
        gui/libpingus_gui.a \
         input/libpingus_input.a \
@@ -263,15 +265,6 @@
 smallmap.hxx \
 smallmap_image.cxx \
 smallmap_image.hxx \
-sound.cxx \
-sound.hxx \
-sounds.hxx \
-sound_dummy.cxx \
-sound_dummy.hxx \
-sound_real.cxx \
-sound_real.hxx \
-specs_reader.cxx \
-specs_reader.hxx \
 spot_map.cxx \
 spot_map.hxx \
 sprite.cxx \

Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- client.cxx  15 Jan 2003 21:16:41 -0000      1.38
+++ client.cxx  18 Feb 2003 15:04:47 -0000      1.39
@@ -24,7 +24,7 @@
 #include "playfield.hxx"
 #include "timer.hxx"
 #include "pingus_resource.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "time_display.hxx"
 #include "pingus_counter.hxx"
 #include "smallmap.hxx"

Index: credits.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- credits.cxx 5 Nov 2002 03:02:48 -0000       1.13
+++ credits.cxx 18 Feb 2003 15:04:47 -0000      1.14
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "pingus_resource.hxx"
 #include "credits.hxx"
 #include "screen_manager.hxx"

Index: level_result.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/level_result.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- level_result.cxx    4 Oct 2002 16:54:04 -0000       1.6
+++ level_result.cxx    18 Feb 2003 15:04:47 -0000      1.7
@@ -25,7 +25,7 @@
 #include "pingus_resource.hxx"
 #include "level_result.hxx"
 #include "display.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "world.hxx"
 #include "pingu_holder.hxx"
 

Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- pingu.cxx   26 Nov 2002 10:12:53 -0000      1.37
+++ pingu.cxx   18 Feb 2003 15:04:47 -0000      1.38
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "globals.hxx"
 #include "world.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "col_map.hxx"
 #include "pingu_action.hxx"
 #include "pingu_action_factory.hxx"

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- pingus_main.cxx     18 Feb 2003 11:28:41 -0000      1.42
+++ pingus_main.cxx     18 Feb 2003 15:04:47 -0000      1.43
@@ -81,7 +81,7 @@
 #include "pingus_resource.hxx"
 #include "pingu_action_factory.hxx"
 #include "credits.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "cheat.hxx"
 
 using EditorNS::Editor;
@@ -222,6 +222,7 @@
       {"min-cpu-usage",     no_argument,       0, 153},
       {"min-frame-skip",    required_argument, 0, 154},
       {"max-frame-skip",    required_argument, 0, 155},
+      {"frame-skip",        required_argument, 0, 157},
       {"cheat",             required_argument, 0, 156},
 #ifdef HAVE_LIBCLANGL
       {"use-opengl",        no_argument,       0, 'G'},
@@ -498,6 +499,11 @@
       sscanf(optarg, "%d", &max_frame_skip);
       break;
 
+    case 157: // frame_skip
+      sscanf(optarg, "%d", &max_frame_skip);
+      min_frame_skip = max_frame_skip;
+      break;
+
     case 156: // Cheats
       Cheat::activate(optarg);
       break;
@@ -543,6 +549,7 @@
           "                            reduce CPU usage, might speed up the 
game on slower machines\n"
           "   --min-frame-skip N       Skip at least N frames, larger values 
speed the game up\n"
           "   --max-frame-skip N       Skip at most N frames\n"
+          "   --frame-skip N           Set both min and max frameskip to N\n"
 
           "\nDebugging and experimental stuff:\n"
           "   --maintainer-mode        Enables some features, only interesting 
programmers\n"
@@ -645,6 +652,27 @@
 }
 
 void
+PingusMain::print_greeting_message()
+{
+  std::cout << "Welcome to Pingus "VERSION"!\n"
+            << "=========================\n" << std::endl;
+  
+#ifdef HAVE_LIBCLANVORBIS
+  std::cout << "clanVorbis support: ok" << std::endl;
+#else
+  std::cout << "clanVoribs support: missing (.ogg music files will not be 
playable)" << std::endl;
+#endif
+
+#ifdef HAVE_LIBCLANMIKMOD
+  std::cout << "clanMikMod support: ok" << std::endl;
+#else
+  std::cout << "clanMikMod support: missing (.it and .s3m music files will not 
be playable)" << std::endl;
+#endif
+
+  std::cout << std::endl;
+}
+
+void
 PingusMain::start_game ()
 {
   if (verbose) {
@@ -731,6 +759,8 @@
 
   try 
     {
+      print_greeting_message();
+
       quick_check_args(argc, argv);
       read_rc_file();
       check_args(argc, argv);

Index: pingus_main.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pingus_main.hxx     2 Nov 2002 19:03:40 -0000       1.6
+++ pingus_main.hxx     18 Feb 2003 15:04:47 -0000      1.7
@@ -57,6 +57,8 @@
   void quick_check_args(int argc, char** argv);
   void read_rc_file(void);
 
+  void print_greeting_message();
+
   void init_clanlib();
   void deinit_clanlib();
 

Index: pingus_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pingus_menu.cxx     8 Nov 2002 01:38:27 -0000       1.10
+++ pingus_menu.cxx     18 Feb 2003 15:04:47 -0000      1.11
@@ -19,7 +19,7 @@
 
 #include "surface_button.hxx"
 #include "pingus_resource.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "debug.hxx"
 #include "pingus_menu_manager.hxx"
 #include "gui/gui_manager.hxx"

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- surface_button.cxx  8 Nov 2002 01:38:27 -0000       1.18
+++ surface_button.cxx  18 Feb 2003 15:04:47 -0000      1.19
@@ -21,7 +21,7 @@
 #include <ClanLib/Display/Font/font.h>
 #include "globals.hxx"
 #include "debug.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "pingus_resource.hxx"
 #include "pingus_menu_manager.hxx"
 #include "credits.hxx"

Index: theme_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme_selector.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- theme_selector.cxx  28 Sep 2002 11:52:22 -0000      1.7
+++ theme_selector.cxx  18 Feb 2003 15:04:47 -0000      1.8
@@ -32,7 +32,7 @@
 #include "pingus_resource.hxx"
 #include "display.hxx"
 #include "loading.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "path_manager.hxx"
 #include "system.hxx"
 #include "theme.hxx"

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- world.cxx   25 Jan 2003 11:03:58 -0000      1.36
+++ world.cxx   18 Feb 2003 15:04:47 -0000      1.37
@@ -22,7 +22,7 @@
 #include <iostream>
 #include "plf.hxx"
 #include "pingu_holder.hxx"
-#include "sound.hxx"
+#include "sound/sound.hxx"
 #include "spot_map.hxx"
 #include "view.hxx"
 #include "world.hxx"

--- specs_reader.cxx DELETED ---

--- specs_reader.hxx DELETED ---