X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=04d7f32a228cc26d53b5e85ce8143c3f6b83c194;hb=60905b7f08ae9a2c88299731a8ce490c31d8b6e0;hp=19c91ca787844c09114d0f2317cb44970224c747;hpb=12677c5a393c075d0f2d8ff25604e44e310763df;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 19c91ca7..04d7f32a 100644 --- a/src/init.c +++ b/src/init.c @@ -318,23 +318,6 @@ void InitImageTextures(void) CreateImageTextures(texture_graphics[i]); } -#if 1 -// !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! -void SetBitmaps_EM(Bitmap **em_bitmap) -{ - em_bitmap[0] = graphic_info[IMG_EMC_OBJECT].bitmap; - em_bitmap[1] = graphic_info[IMG_EMC_SPRITE].bitmap; -} -#endif - -#if 0 -// !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! -void SetBitmaps_SP(Bitmap **sp_bitmap) -{ - *sp_bitmap = graphic_info[IMG_SP_OBJECTS].bitmap; -} -#endif - static int getFontBitmapID(int font_nr) { int special = -1; @@ -2879,6 +2862,7 @@ void InitElementPropertiesStatic(void) EL_BOMB, EL_NUT, EL_AMOEBA_DROP, + EL_AMOEBA_DROPPING, EL_QUICKSAND_FULL, EL_QUICKSAND_FAST_FULL, EL_MAGIC_WALL_FULL, @@ -5925,6 +5909,7 @@ void ReloadCustomArtwork(int force_reload) InitOverrideArtwork(); force_reload_gfx |= AdjustGraphicsForEMC(); + force_reload_snd |= AdjustSoundsForEMC(); gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS); snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);