From: Holger Schemel Date: Sun, 16 Feb 2003 23:44:17 +0000 (+0100) Subject: rnd-20030217-1-src X-Git-Tag: 3.0.0^2~140 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c8acee298eb56783813578bf38cabddfee9976c4;p=rocksndiamonds.git rnd-20030217-1-src --- diff --git a/src/conftime.h b/src/conftime.h index 49fba991..6e6a198c 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-02-15 00:07]" +#define COMPILE_DATE_STRING "[2003-02-17 00:43]" diff --git a/src/editor.c b/src/editor.c index 633a5586..0b62ca19 100644 --- a/src/editor.c +++ b/src/editor.c @@ -2491,7 +2491,7 @@ static void CopyCustomElementPropertiesToEditor() int properties = Properties1[element]; custom_element_properties[i].indestructible = - ((properties & EP_BIT_MASSIVE) != 0 ? TRUE : FALSE); + ((properties & EP_BIT_INDESTRUCTIBLE) != 0 ? TRUE : FALSE); custom_element_properties[i].can_fall = ((properties & EP_BIT_CAN_FALL) != 0 ? TRUE : FALSE); @@ -2518,9 +2518,9 @@ static void CopyCustomElementPropertiesToGame() Properties1[element] = EP_BITMASK_DEFAULT; if (custom_element_properties[i].indestructible) - Properties1[element] |= EP_BIT_MASSIVE; + Properties1[element] |= EP_BIT_INDESTRUCTIBLE; else - Properties1[element] &= ~EP_BIT_MASSIVE; + Properties1[element] &= ~EP_BIT_INDESTRUCTIBLE; if (custom_element_properties[i].can_fall) Properties1[element] |= EP_BIT_CAN_FALL; diff --git a/src/game.c b/src/game.c index f86dffae..324c8e81 100644 --- a/src/game.c +++ b/src/game.c @@ -471,7 +471,7 @@ void DrawGameDoorValues() for (j=0; j<4; j++) if (stored_player[i].key[j]) DrawMiniGraphicExt(drawto, DX_KEYS + j * MINI_TILEX, DY_KEYS, - IMG_KEY1 + j); + el2edimg(EL_KEY1 + j)); DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS, int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW); @@ -1512,7 +1512,7 @@ void Explode(int ex, int ey, int phase, int mode) RemoveMovingField(x, y); } - if (IS_MASSIVE(element) || element == EL_FLAMES) + if (IS_INDESTRUCTIBLE(element) || element == EL_FLAMES) continue; if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y))) @@ -1714,7 +1714,7 @@ void DynaExplode(int ex, int ey) int y = ey + j * xy[i % 4][1]; int element; - if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(Feld[x][y])) + if (!IN_LEV_FIELD(x, y) || IS_INDESTRUCTIBLE(Feld[x][y])) break; element = Feld[x][y]; @@ -5934,14 +5934,15 @@ int DigField(struct PlayerInfo *player, case EL_KEY4: { int key_nr = element - EL_KEY1; + int graphic = el2edimg(element); RemoveField(x, y); player->key[key_nr] = TRUE; RaiseScoreElement(element); DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - IMG_KEY1 + key_nr); + graphic); DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - IMG_KEY1 + key_nr); + graphic); PlaySoundLevel(x, y, SND_KEY_COLLECTING); break; } @@ -5952,14 +5953,15 @@ int DigField(struct PlayerInfo *player, case EL_EM_KEY4: { int key_nr = element - EL_EM_KEY1; + int graphic = el2edimg(EL_KEY1 + key_nr); RemoveField(x, y); player->key[key_nr] = TRUE; RaiseScoreElement(element); DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - IMG_KEY1 + key_nr); + graphic); DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - IMG_KEY1 + key_nr); + graphic); PlaySoundLevel(x, y, SND_KEY_COLLECTING); break; } diff --git a/src/init.c b/src/init.c index 862365fa..d7be34a6 100644 --- a/src/init.c +++ b/src/init.c @@ -175,6 +175,12 @@ static void InitArtworkConfig() "global.num_toons", NULL }; + static char *ignore_sound_tokens[] = + { + "name", + "sort_priority", + NULL + }; int i; for (i=0; i