Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30379/include
Modified Files:
proto.h sound.h
Log Message:
Initial SDL patch for multilayered sounds.
Index: sound.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sound.h 21 Jan 2003 21:27:55 -0000 1.1.1.1
+++ sound.h 24 Apr 2006 14:13:25 -0000 1.2
@@ -58,4 +58,28 @@
extern void Init_Sound (void);
extern void Exit_Sound (void);
+enum {
+ CLOAKED_WAV,
+ ENGINE_WAV,
+ ENTER_SHIP_WAV,
+ EXPLOSION_WAV,
+ EXPLOSION_OTHER_WAV,
+ FIRE_PLASMA_WAV,
+ FIRE_TORP_WAV,
+ FIRE_TORP_OTHER_WAV,
+ INTRO_WAV,
+ MESSAGE_WAV,
+ PHASER_WAV,
+ PHASER_OTHER_WAV,
+ PLASMA_HIT_WAV,
+ RED_ALERT_WAV,
+ SELF_DESTRUCT_WAV,
+ SHIELD_DOWN_WAV,
+ SHIELD_UP_WAV,
+ TORP_HIT_WAV,
+ UNCLOAK_WAV,
+ WARNING_WAV,
+ NUM_WAVES
+};
+
#endif /* __SOUND_H */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- proto.h 21 Apr 2006 12:00:06 -0000 1.6
+++ proto.h 24 Apr 2006 14:13:25 -0000 1.7
@@ -1089,7 +1089,9 @@
extern void Abort_Sound (int type);
extern void soundwindow (void);
//static void soundrefresh(int i);
+#if defined(SOUND) && !defined(HAVE_SDL)
void soundaction (W_Event * data);
+#endif
extern void sounddone (void);
/******************************************************************************/