[netrek-cvs] client/netrekxp/src beeplite.c, 1.10, 1.11 sound.c, 1.16, 1.17 warning.c, 1.9, 1.10

[Bill Balcerski]

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

Modified Files:
	beeplite.c sound.c warning.c 
Log Message:
Added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav)
Added enter ship sound to when you refit

Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- beeplite.c	3 Jun 2006 07:03:42 -0000	1.10
+++ beeplite.c	11 Jun 2006 09:36:25 -0000	1.11
@@ -228,7 +228,7 @@
   	        if (F_beeplite_flags & LITE_SOUNDS)
   	        {
 	          if (newSound)
-	            Play_Sound(MESSAGE_WAV);
+	            Play_Sound(MESSAGE3_WAV);
 	          else
 		    Play_Sound(MESSAGE3_SOUND);
 		}
@@ -237,7 +237,7 @@
 	        if (F_beeplite_flags & LITE_SOUNDS)
 	        {
 	          if (newSound)
-	            Play_Sound(MESSAGE_WAV);
+	            Play_Sound(MESSAGE4_WAV);
 	          else
 		    Play_Sound(MESSAGE4_SOUND);
 		}
@@ -246,7 +246,7 @@
 	        if (F_beeplite_flags & LITE_SOUNDS)
 	        {
 	          if (newSound)
-	            Play_Sound(MESSAGE_WAV);
+	            Play_Sound(MESSAGE5_WAV);
 	          else
 		    Play_Sound(MESSAGE5_SOUND);
 		}
@@ -255,7 +255,7 @@
 	        if (F_beeplite_flags & LITE_SOUNDS)
 	        {
 	          if (newSound)
-	            Play_Sound(MESSAGE_WAV);
+	            Play_Sound(MESSAGE6_WAV);
 	          else
 		    Play_Sound(MESSAGE6_SOUND);
 		}
@@ -264,7 +264,7 @@
 	        if (F_beeplite_flags & LITE_SOUNDS)
 	        {
 	          if (newSound)
-	            Play_Sound(MESSAGE_WAV);
+	            Play_Sound(MESSAGE7_WAV);
 	          else
 		    Play_Sound(MESSAGE7_SOUND);
 		}

Index: warning.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- warning.c	9 Jun 2006 02:14:08 -0000	1.9
+++ warning.c	11 Jun 2006 09:36:25 -0000	1.10
@@ -45,7 +45,15 @@
     warncount = strlen (text);
     
     if (doRefit)
+    {
+#ifdef SOUND
+        if (newSound)
+            Play_Sound(ENTER_SHIP_WAV);
+        else
+            Play_Sound(ENTER_SHIP_SOUND);
+#endif
        rdelay = time (0) + REFITTIME;
+    }
     if (doDeclare)
        delay = time (0) + DECLARETIME;
        

Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sound.c	9 Jun 2006 22:08:40 -0000	1.16
+++ sound.c	11 Jun 2006 09:36:25 -0000	1.17
@@ -113,6 +113,11 @@
   newsounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav"));
   newsounds[MESSAGE1_WAV] = Mix_LoadWAV(DATAFILE("nt_message1.wav"));
   newsounds[MESSAGE2_WAV] = Mix_LoadWAV(DATAFILE("nt_message2.wav"));
+  newsounds[MESSAGE3_WAV] = Mix_LoadWAV(DATAFILE("nt_message3.wav"));
+  newsounds[MESSAGE4_WAV] = Mix_LoadWAV(DATAFILE("nt_message4.wav"));
+  newsounds[MESSAGE5_WAV] = Mix_LoadWAV(DATAFILE("nt_message5.wav"));
+  newsounds[MESSAGE6_WAV] = Mix_LoadWAV(DATAFILE("nt_message6.wav"));
+  newsounds[MESSAGE7_WAV] = Mix_LoadWAV(DATAFILE("nt_message7.wav"));
   newsounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav"));
   newsounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav"));
   newsounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav"));