From: Holger Schemel Date: Sat, 18 Jan 2003 13:22:38 +0000 (+0100) Subject: rnd-20030118-5-src X-Git-Tag: 3.0.0^2~171 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=69eca5c908598155bf3f5d1fa74e73ff9e2bbbc9;p=rocksndiamonds.git rnd-20030118-5-src --- diff --git a/src/conftime.h b/src/conftime.h index 15646aa6..23667f1d 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-01-18 13:34]" +#define COMPILE_DATE_STRING "[2003-01-18 14:21]" diff --git a/src/game.c b/src/game.c index 46a99c8f..10e6e2fb 100644 --- a/src/game.c +++ b/src/game.c @@ -115,41 +115,8 @@ static void HandleGameButtons(struct GadgetInfo *); static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS]; -#define IS_ANIMATED(g) (graphic_info[g].anim_frames > 1) - - -/* ------------------------------------------------------------------------- */ -/* sound definitions */ -/* ------------------------------------------------------------------------- */ - -static struct -{ - char *text; - int value; - boolean is_loop; -} sound_action_properties[] = -{ - /* insert _all_ loop sound actions here */ - { ".waiting", ACTION_WAITING, TRUE }, - { ".moving", ACTION_MOVING, TRUE }, /* continuos moving */ - { ".active", ACTION_ACTIVE, TRUE }, - { ".growing", ACTION_GROWING, TRUE }, - { ".attacking", ACTION_ATTACKING, TRUE }, - - /* other (non-loop) sound actions are optional */ - { ".stepping", ACTION_MOVING, FALSE }, /* discrete moving */ - { ".digging", ACTION_DIGGING, FALSE }, - { ".collecting", ACTION_COLLECTING, FALSE }, - { ".passing", ACTION_PASSING, FALSE }, - { ".impact", ACTION_IMPACT, FALSE }, - { ".pushing", ACTION_PUSHING, FALSE }, - { ".activating", ACTION_ACTIVATING, FALSE }, - { NULL, 0, 0 }, -}; -static int element_action_sound[MAX_NUM_ELEMENTS][NUM_ACTIONS]; -static boolean is_loop_sound[NUM_SOUND_FILES]; - -#define IS_LOOP_SOUND(x) (is_loop_sound[x]) +#define IS_ANIMATED(g) (graphic_info[g].anim_frames > 1) +#define IS_LOOP_SOUND(s) (sound_info[s].loop) /* ------------------------------------------------------------------------- @@ -565,97 +532,6 @@ void DrawGameDoorValues() } -/* - ============================================================================= - InitGameSound() - ----------------------------------------------------------------------------- - initialize sound effect lookup table for element actions - ============================================================================= -*/ - -void InitGameSound() -{ - int sound_effect_properties[NUM_SOUND_FILES]; - int i, j; - -#if 0 - debug_print_timestamp(0, NULL); -#endif - - /* initialize sound effect for all elements to "no sound" */ - for (i=0; i