From aca666256c715771b11d3277e10ff971aea44af8 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 13 Dec 2003 17:02:23 +0100 Subject: [PATCH] rnd-20031213-1-src * fixed bug with double nut cracking sound (by eliminating "default element action sound" assignment in init.c) * fixed crash when no music info files are available --- CHANGES | 18 +++++++++++++++++- ChangeLog | 9 ++++++++- src/conftime.h | 2 +- src/editor.c | 4 ++++ src/files.c | 2 +- src/init.c | 3 +++ src/libgame/setup.c | 6 ++++-- src/screens.c | 8 ++++++++ 8 files changed, 46 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 0df493d1..223c6183 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,21 @@ -Release Version 3.0.8 [?? ??? ????] +Release Version 3.0.8 [13 DEC 2003] ----------------------------------- + - added "musicinfo.conf" for menu and level music configuration + - added "editorsetup.conf" for editor element list configuration + - added "copy" and "exchange" functions for custom elements to editor + - added configurable "bored" and "sleeping" animations for the player + - added "awakening" sound for player waking up after sleeping + - added configurable element animations for info screen + - added configurable music credits for info screen + - added configurable level set information for info screen + - added warnings for undefined token values in artwork config files + - menu text now directly clickable + - better sniksnak turning movement (two steps instead of only one) + - fixed turning movement of butterflies and fireflies (no frame reset) + - fixed bug with wrong default impact sound for colored emeralds + - fixed bug with double nut cracking sound + - fixed a very nasty bug in dragon turning code in TurnRoundExt() + - finally fixed tape recording when player is created from CE change Release Version 3.0.7 [10 NOV 2003] ----------------------------------- diff --git a/ChangeLog b/ChangeLog index b04fc9a3..2fccf0c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-13 + * fixed bug with double nut cracking sound + (by eliminating "default element action sound" assignment in init.c) + +2003-12-10 + * fixed crash when no music info files are available + 2003-12-07 * fixed boring and sleeping sounds @@ -32,7 +39,7 @@ * added configurable music credits for info screen 2003-11-19 - * finally fixed tape recording when player is created from CE + * finally fixed tape recording when player is created from CE change 2003-11-18 * added "editorsetup.conf" for editor element list configuration diff --git a/src/conftime.h b/src/conftime.h index 3533a548..606fe707 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-12-10 18:54]" +#define COMPILE_DATE_STRING "[2003-12-13 16:52]" diff --git a/src/editor.c b/src/editor.c index 68a0680a..f6df5544 100644 --- a/src/editor.c +++ b/src/editor.c @@ -2146,7 +2146,11 @@ static int editor_el_more[] = EL_BD_FIREFLY, EL_MOLE_LEFT, +#if 0 EL_MAZE_RUNNER, +#else + EL_EMPTY, +#endif EL_MOLE_RIGHT, EL_PACMAN, diff --git a/src/files.c b/src/files.c index b7d62ce7..e064ee6d 100644 --- a/src/files.c +++ b/src/files.c @@ -2916,7 +2916,7 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, char *value = getHashEntry(setup_file_hash, token_to_value_ptr[i].token); *token_to_value_ptr[i].value_ptr = - getStringCopy(value != NULL ? value : UNKNOWN_NAME); + getStringCopy(value != NULL && *value != '\0' ? value : UNKNOWN_NAME); } tmp_music_file_info.basename = basename; diff --git a/src/init.c b/src/init.c index be4422c6..104aef40 100644 --- a/src/init.c +++ b/src/init.c @@ -1192,9 +1192,12 @@ static void InitElementSoundInfo() if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].sound[act] != -1) default_action_sound = element_info[EL_SB_DEFAULT].sound[act]; + /* !!! there's no such thing as a "default action sound" !!! */ +#if 0 /* look for element specific default sound (independent from action) */ if (element_info[i].sound[ACTION_DEFAULT] != -1) default_action_sound = element_info[i].sound[ACTION_DEFAULT]; +#endif /* no sound for this specific action -- use default action sound */ if (element_info[i].sound[act] == -1) diff --git a/src/libgame/setup.c b/src/libgame/setup.c index b1e3b443..1ff198f0 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -474,11 +474,13 @@ char *getLevelSetInfoFilename() static char *filename = NULL; char *basenames[] = { - "readme", - "readme.txt", "README", "README.txt", "README.TXT", + "Readme", + "Readme.txt", + "readme", + "readme.txt", NULL }; diff --git a/src/screens.c b/src/screens.c index 7952e8b8..079745e9 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1952,7 +1952,9 @@ static struct TokenInfo setup_info_game[] = static struct TokenInfo setup_info_editor[] = { +#if 0 { TYPE_STRING, NULL, "Offer Special Elements:"}, +#endif { TYPE_SWITCH, &setup.editor.el_boulderdash, "BoulderDash:" }, { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, { TYPE_SWITCH, &setup.editor.el_more, "More:" }, @@ -2208,8 +2210,14 @@ static void DrawSetupScreen_Generic() (value_ptr == &setup.fullscreen && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; +#if 0 + if (setup_info[i].type & TYPE_STRING || + (setup_info[i].type & TYPE_SWITCH && setup_mode == SETUP_MODE_EDITOR)) + font_nr = FONT_MENU_2; +#else if (setup_info[i].type & TYPE_STRING) font_nr = FONT_MENU_2; +#endif DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr); -- 2.34.1