[netrek-cvs] client/netrekxp/include data.h, 1.43, 1.44 proto.h, 1.27, 1.28 sound.h, 1.10, 1.11

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30543/include

Modified Files:
	data.h proto.h sound.h 
Log Message:
Fixed bug with metaserver - if server entry in metacache indicated one status, and we
receive a new server packet with a different status, that packet is no long rejected
based on packet age, new packets are considered priority in case of such a 
difference.
Added 9  new star trek theme songs.
Added 3 new netrekrc options (newSoundEffects, newSoundMusic, and newSoundMusicBkgd)
that allow for sound effect and music playback to be toggled separately.
Random intro sounds (instead of just the typical Kirk intro) - now all 5 trek series are represented.
Random genocide sounds (4 end themes from the trek series).
Music now fades out over 5 seconds upon entering game, rather than ending abruptly.

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- data.h	13 Dec 2006 00:00:00 -0000	1.43
+++ data.h	31 Jan 2007 07:06:36 -0000	1.44
@@ -527,6 +527,7 @@
 #include "sound.h"
 extern int sound_init;
 extern int sound_toggle;
+extern int music_toggle;
 extern char *sounddir;
 extern W_Window soundWin;
 
@@ -688,10 +689,13 @@
 
 extern WNDPROC lpfnDefRichEditWndProc;  /* default window procedure for our richedit controls */
 
-extern int richText;    /* temporary variable to enable/disable rich text windows */
-extern int newQuit;     /* new quit clock */
-extern int newSound;	/* Use new SDL sound interface */
-extern int newSoundAngles; /* Use SDL with angular 3D sound */
+extern int richText;    	/* temporary variable to enable/disable rich text windows */
+extern int newQuit;     	/* new quit clock */
+extern int newSound;		/* Use new SDL sound interface */
+extern int newSoundEffects;	/* Use SDL sound effects playback */
+extern int newSoundMusic;	/* Use SDL music playback */
+extern int newSoundMusicBkgd;	/* Play random background music continuously */
+extern int newSoundAngles;	/* Use SDL with angular 3D sound */
 
 extern int useFullShipInfo;  /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */
 #endif /* _h_data */

Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.h	20 Sep 2006 13:04:52 -0000	1.10
+++ sound.h	31 Jan 2007 07:06:36 -0000	1.11
@@ -59,6 +59,8 @@
 
 extern void Play_Sound (int type);
 extern void Play_Sound_Loc (int type, int angle, int distance);
+extern void Play_Music (int type);
+extern void Play_Music_Bkgd (void);
 extern void Abort_Sound (int type);
 extern void Init_Sound (void);
 extern void Exit_Sound (void);
@@ -101,4 +103,18 @@
   NUM_WAVES
 };
 
+enum {
+  INTRO1_MUSIC,
+  INTRO2_MUSIC,
+  INTRO3_MUSIC,
+  INTRO4_MUSIC,
+  INTRO5_MUSIC,
+  END1_MUSIC,
+  END2_MUSIC,
+  END3_MUSIC,
+  END4_MUSIC,
+  NUM_MUSIC,
+};
+#define MUSIC_OFFSET	END1_MUSIC /* Offset for end music */
+
 #endif /* __SOUND_H */

Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- proto.h	13 Dec 2006 07:16:28 -0000	1.27
+++ proto.h	31 Jan 2007 07:06:36 -0000	1.28
@@ -1146,6 +1146,7 @@
      extern void Init_Sound (void);
      extern void Play_Sound (int type);
      extern void Play_Sound_Loc (int type, int angle, int distance);
+     extern void Play_Music (int type);
      void Group_Sound (int type, int channel);
      extern void Abort_Sound (int type);
      extern void soundwindow (void);