X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsample.h;h=90c45a9ba54e5bb95b0d7b858d9b3e12c96c6334;hb=3e71d06e9a97be7bb8c50c76717d08e5c46e0cc8;hp=680aff05765be16c22a9b34e0617d563b6265d1e;hpb=2b65ec99f743dde3ee41083cf89623d4d9b8740e;p=rocksndiamonds.git

diff --git a/src/game_em/sample.h b/src/game_em/sample.h
index 680aff05..90c45a9b 100644
--- a/src/game_em/sample.h
+++ b/src/game_em/sample.h
@@ -1,48 +1,72 @@
 #ifndef SAMPLE_H
 #define SAMPLE_H
 
-enum {
-	SAMPLE_blank = 0, /* player walks on blank */
-	SAMPLE_roll, /* player pushes stone/bomb/nut */
-	SAMPLE_stone, /* stone hits ground */
-	SAMPLE_nut, /* nut hits ground */
-	SAMPLE_crack, /* stone hits nut */
-	SAMPLE_bug, /* bug moves */
-	SAMPLE_tank, /* tank moves */
-	SAMPLE_android, /* android places something */
-	SAMPLE_spring, /* spring hits ground/wall/bumper, stone hits spring */
-	SAMPLE_slurp, /* spring kills alien */
-	SAMPLE_eater, /* eater sits/eats diamond */
-	SAMPLE_alien, /* alien moves */
-	SAMPLE_collect, /* player collects diamond/emerald/dynamite/key/lenses/magnify */
-	SAMPLE_diamond, /* diamond/emerald hits ground */
-	SAMPLE_squash, /* stone squashes diamond, stone/emerald/diamond thru wonderwall */
-	SAMPLE_drip, /* drip hits ground */
-	SAMPLE_push, /* player pushes spring/balloon/android */
-	SAMPLE_dirt, /* player walks on dirt */
-	SAMPLE_acid, /* acid splashes */
-	SAMPLE_ball, /* ball places something */
-	SAMPLE_grow, /* growing wall grows */
-	SAMPLE_wonder, /* wonderwall moves */
-	SAMPLE_door, /* player goes thru door */
-	SAMPLE_exit, /* player goes in exit */
-	SAMPLE_dynamite, /* player places dynamite */
-	SAMPLE_tick, /* dynamite ticks */
-	SAMPLE_press, /* player presses wheel/wind/switch */
-	SAMPLE_wheel, /* wheel moves */
-	SAMPLE_boom, /* explosion */
-	SAMPLE_time, /* time runs out */
-	SAMPLE_die, /* player dies */
-	SAMPLE_MAX
+#include "main_em.h"
+
+
+#if 0
+
+enum
+{
+  SAMPLE_blank = 0,	/* player walks on blank */
+  SAMPLE_roll,		/* player pushes stone/bomb/nut/spring */
+  SAMPLE_stone,		/* stone hits ground */
+  SAMPLE_nut,		/* nut hits ground */
+  SAMPLE_crack,		/* stone hits nut */
+  SAMPLE_bug,		/* bug moves */
+  SAMPLE_tank,		/* tank moves */
+  SAMPLE_android_clone,	/* android places something */
+  SAMPLE_android_move,	/* android moves */
+  SAMPLE_spring,	/* spring hits ground/wall/bumper, stone hits spring */
+  SAMPLE_slurp,		/* spring kills alien */
+  SAMPLE_eater,		/* eater sits */
+  SAMPLE_eater_eat,	/* eater eats diamond */
+  SAMPLE_alien,		/* alien moves */
+  SAMPLE_collect,	/* player collects object */
+  SAMPLE_diamond,	/* diamond/emerald hits ground */
+  SAMPLE_squash,	/* stone squashes diamond */
+  SAMPLE_wonderfall,	/* object falls thru wonderwall */
+  SAMPLE_drip,		/* drip hits ground */
+  SAMPLE_push,		/* player pushes balloon/android */
+  SAMPLE_dirt,		/* player walks on dirt */
+  SAMPLE_acid,		/* acid splashes */
+  SAMPLE_ball,		/* ball places something */
+  SAMPLE_grow,		/* growing wall grows */
+  SAMPLE_wonder,	/* wonderwall moves (is active) */
+  SAMPLE_door,		/* player goes thru door */
+  SAMPLE_exit_open,	/* exit opens */
+  SAMPLE_exit_leave,	/* player goes into exit */
+  SAMPLE_dynamite,	/* player places dynamite */
+  SAMPLE_tick,		/* dynamite ticks */
+  SAMPLE_press,		/* player presses wheel/wind/switch */
+  SAMPLE_wheel,		/* wheel moves */
+  SAMPLE_boom,		/* explosion */
+  SAMPLE_time,		/* time runs out */
+  SAMPLE_die,		/* player dies */
+
+  SAMPLE_MAX
 };
 
+#endif
+
+extern void play_sound(int, int, int);
+extern void play_element_sound(int, int, int, int);
+
 extern char play[SAMPLE_MAX];
 extern int sound_pipe[2];
 extern short *sound_data[SAMPLE_MAX];
 extern long sound_length[SAMPLE_MAX];
 
-#define MIXER_MAX 4 /* maximum number of samples we can play at once */
+#define MIXER_MAX 4	/* maximum number of samples we can play at once */
 
-enum { AUDIO_ULAW = 0, AUDIO_U8 };
+#if defined(AUDIO_UNIX_NATIVE)
 
-#endif
+enum
+{
+  AUDIO_ULAW = 0,
+  AUDIO_U8
+};
+
+#endif	/* AUDIO_UNIX_NATIVE */
+
+#endif	/* SAMPLE_H */