From: Holger Schemel Date: Sat, 8 Feb 2003 17:59:33 +0000 (+0100) Subject: rnd-20030208-3-src X-Git-Tag: 3.0.0^2~146 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=939a6fd558cffde54d72f9f562e504bbeffc638c;p=rocksndiamonds.git rnd-20030208-3-src --- diff --git a/src/conf_e2g.c b/src/conf_e2g.c index 82d0051f..176701b6 100644 --- a/src/conf_e2g.c +++ b/src/conf_e2g.c @@ -2252,6 +2252,10 @@ element_to_graphic[] = EL_ARROW_RED_DOWN, -1, -1, IMG_ARROW_RED_DOWN }, + { + EL_BUG, -1, -1, + IMG_BUG_RIGHT + }, { EL_DOOR_WHITE, -1, -1, IMG_CHAR_QUESTION @@ -2288,6 +2292,10 @@ element_to_graphic[] = EL_KEY_WHITE, -1, -1, IMG_CHAR_QUESTION }, + { + EL_PACMAN, -1, -1, + IMG_PACMAN_RIGHT + }, { EL_SIGN_EXIT, -1, -1, IMG_CHAR_QUESTION @@ -2328,6 +2336,10 @@ element_to_graphic[] = EL_SIGN_YINYANG, -1, -1, IMG_CHAR_QUESTION }, + { + EL_SPACESHIP, -1, -1, + IMG_SPACESHIP_RIGHT + }, { EL_CHAR_SPACE, -1, -1, IMG_CHAR_SPACE diff --git a/src/conf_snd.c b/src/conf_snd.c index 07ce6b44..0dc227f9 100644 --- a/src/conf_snd.c +++ b/src/conf_snd.c @@ -220,8 +220,12 @@ struct ConfigInfo sound_config[] = /* sounds for other non-game actions */ { "menu.door_opening", "oeffnen.wav" }, { "menu.door_closing", "oeffnen.wav" }, + { "menu.hall_of_fame", "halloffame.wav" }, + { "menu.hall_of_fame.mode_loop", "false" }, + { "menu.info_screen", "rhythmloop.wav" }, + { "menu.info_screen.mode_loop", "true" }, #if 0 { "[not used]", "antigrav.wav" }, diff --git a/src/conftime.h b/src/conftime.h index 14bfe670..a95a19e7 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-02-08 17:50]" +#define COMPILE_DATE_STRING "[2003-02-08 18:58]" diff --git a/src/init.c b/src/init.c index 5a97a827..0e208dbb 100644 --- a/src/init.c +++ b/src/init.c @@ -857,7 +857,7 @@ void InitElementSpecialGraphicInfo() static void InitElementSoundInfo() { - /* soon to come */ + /* !!! soon to come !!! */ } static void set_graphic_parameters(int graphic, char **parameter_raw) diff --git a/src/screens.c b/src/screens.c index f5e2239a..830834d8 100644 --- a/src/screens.c +++ b/src/screens.c @@ -114,6 +114,20 @@ static void drawCursorXY(int xpos, int ypos, int graphic) drawCursorExt(xpos, ypos, -1, graphic); } +static void PlaySound_Menu_Start(int sound) +{ + if (sound_info[sound].loop) + PlaySoundLoop(sound); + else + PlaySound(sound); +} + +static void PlaySound_Menu_Continue(int sound) +{ + if (sound_info[sound].loop) + PlaySoundLoop(sound); +} + void DrawTextStatic(int x, int y, char *text, int font_size, int font_type) { if (game_status == MAINMENU && gfx.menu_main_hide_static_text) @@ -1147,7 +1161,12 @@ void DrawHelpScreen() FadeToFront(); InitAnimation(); + +#if 0 PlaySoundLoop(SND_MENU_INFO_SCREEN); +#else + PlaySound_Menu_Start(SND_MENU_INFO_SCREEN); +#endif } void HandleHelpScreen(int button) @@ -1206,7 +1225,11 @@ void HandleHelpScreen(int button) /* !!! workaround for playing "music" that is really a sound loop (and must therefore periodically be reactivated with the current sound engine !!! */ +#if 0 PlaySoundLoop(SND_MENU_INFO_SCREEN); +#else + PlaySound_Menu_Continue(SND_MENU_INFO_SCREEN); +#endif DoAnimation(); } @@ -1609,8 +1632,14 @@ void DrawHallOfFame(int highlight_position) FadeToFront(); InitAnimation(); + HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE); + +#if 0 PlaySound(SND_MENU_HALL_OF_FAME); +#else + PlaySound_Menu_Start(SND_MENU_HALL_OF_FAME); +#endif } static void drawHallOfFameList(int first_entry, int highlight_position) @@ -1698,7 +1727,12 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) BackToFront(); if (game_status == HALLOFFAME) + { DoAnimation(); +#if 1 + PlaySound_Menu_Continue(SND_MENU_HALL_OF_FAME); +#endif + } }