X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=e7013f64ed4fd02229d110cf13990ed276b97f7b;hb=732fd648f26b307fa3ab0e2c44ec06eb28d6f0d6;hp=cb782a1f0357598b16e01795519e5a8ff80a5dd3;hpb=64076b9d6ca8f9ea1ddc168b92433c71178e7728;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index cb782a1f..e7013f64 100644 --- a/src/init.c +++ b/src/init.c @@ -2628,7 +2628,7 @@ void InitElementPropertiesEngine(int engine_version) /* ---------- CAN_EXPLODE ---------------------------------------------- */ SET_PROPERTY(i, EP_CAN_EXPLODE, (CAN_EXPLODE_BY_FIRE(i) || CAN_EXPLODE_SMASHED(i) || - CAN_EXPLODE_BY_FIRE(i))); + CAN_EXPLODE_IMPACT(i))); } #if 0 @@ -3091,9 +3091,15 @@ void ReloadCustomArtwork() static boolean last_override_level_sounds = FALSE; static boolean last_override_level_music = FALSE; /* identifier for new artwork; default: artwork configured in setup */ +#if 0 char *gfx_new_identifier = artwork.gfx_current->identifier; char *snd_new_identifier = artwork.snd_current->identifier; char *mus_new_identifier = artwork.mus_current->identifier; +#else + char *gfx_new_identifier = artwork.gfx_current_identifier; + char *snd_new_identifier = artwork.snd_current_identifier; + char *mus_new_identifier = artwork.mus_current_identifier; +#endif boolean redraw_screen = FALSE; #if 0 @@ -3123,7 +3129,7 @@ void ReloadCustomArtwork() /* when a new level series was selected, check if there was a change in custom artwork stored in level series directory */ - if (leveldir_current_identifier != leveldir_current->identifier) + if (1 || leveldir_current_identifier != leveldir_current->identifier) { #if 0 char *identifier_old = leveldir_current_identifier; @@ -3224,6 +3230,10 @@ void ReloadCustomArtwork() InitImages(); +#if 0 + printf("::: %d\n", menu.list_size[GAME_MODE_LEVELS]); +#endif + FreeTileClipmasks(); InitTileClipmasks(); #if 0