X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=a25394b6f09f7e7b5615eed538d3e1dcebae42df;hb=6d7ebf6db8a9a57f2e3e398da1d2f7d8d084523f;hp=708ab4a67d66058c99945acf9cc43733631e2b0e;hpb=1e5cae5e3ab889c3bcba80a065c6d7ba1e6d28a2;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 708ab4a6..a25394b6 100644 --- a/src/init.c +++ b/src/init.c @@ -66,6 +66,11 @@ static int copy_properties[][5] = EL_PACMAN_LEFT, EL_PACMAN_RIGHT, EL_PACMAN_UP, EL_PACMAN_DOWN }, + { + EL_YAMYAM, + EL_YAMYAM_LEFT, EL_YAMYAM_RIGHT, + EL_YAMYAM_UP, EL_YAMYAM_DOWN + }, { EL_MOLE, EL_MOLE_LEFT, EL_MOLE_RIGHT, @@ -138,6 +143,15 @@ void InitElementSmallImages() InitElementSmallImagesScaledUp(special_graphics[i]); } +void InitScaledImages() +{ + int i; + + /* scale normal images from static configuration, if not already scaled */ + for (i = 0; i < NUM_IMAGE_FILES; i++) + ScaleImage(i, graphic_info[i].scale_up_factor); +} + #if 1 /* !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!! */ void SetBitmaps_EM(Bitmap **em_bitmap) @@ -290,8 +304,11 @@ void InitFontGraphicInfo() font_bitmap_info[font_bitmap_id].src_y = graphic_info[graphic].src_y; font_bitmap_info[font_bitmap_id].width = graphic_info[graphic].width; font_bitmap_info[font_bitmap_id].height = graphic_info[graphic].height; - font_bitmap_info[font_bitmap_id].draw_x = graphic_info[graphic].draw_x; - font_bitmap_info[font_bitmap_id].draw_y = graphic_info[graphic].draw_y; + + font_bitmap_info[font_bitmap_id].draw_xoffset = + graphic_info[graphic].draw_xoffset; + font_bitmap_info[font_bitmap_id].draw_yoffset = + graphic_info[graphic].draw_yoffset; font_bitmap_info[font_bitmap_id].num_chars = graphic_info[graphic].anim_frames; @@ -320,7 +337,7 @@ void InitElementGraphicInfo() element_info[i].graphic[act] = -1; element_info[i].crumbled[act] = -1; - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) { element_info[i].direction_graphic[act][dir] = -1; element_info[i].direction_crumbled[act][dir] = -1; @@ -404,7 +421,7 @@ void InitElementGraphicInfo() if (crumbled) { if (direction < 0) - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) element_info[element].direction_crumbled[action][dir] = -1; if (direction > -1) @@ -415,7 +432,7 @@ void InitElementGraphicInfo() else { if (direction < 0) - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) element_info[element].direction_graphic[action][dir] = -1; if (direction > -1) @@ -443,7 +460,7 @@ void InitElementGraphicInfo() element_info[i].crumbled[act] = element_info[crumbled_like].crumbled[act]; for (act = 0; act < NUM_ACTIONS; act++) - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) element_info[i].direction_crumbled[act][dir] = element_info[crumbled_like].direction_crumbled[act][dir]; } @@ -452,7 +469,7 @@ void InitElementGraphicInfo() { element_info[i].graphic[ACTION_DIGGING] = element_info[diggable_like].graphic[ACTION_DIGGING]; - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) element_info[i].direction_graphic[ACTION_DIGGING][dir] = element_info[diggable_like].direction_graphic[ACTION_DIGGING][dir]; } @@ -489,7 +506,7 @@ void InitElementGraphicInfo() if (graphic > 0 && graphic_info[graphic].bitmap == NULL) element_info[i].crumbled[act] = -1; - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) { graphic = element_info[i].direction_graphic[act][dir]; if (graphic > 0 && graphic_info[graphic].bitmap == NULL) @@ -508,7 +525,7 @@ void InitElementGraphicInfo() { for (act = 0; act < NUM_ACTIONS; act++) { - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) { int graphic = element_info[i].direction_graphic[act][dir]; int move_dir = (act == ACTION_FALLING ? MV_BIT_DOWN : dir); @@ -566,8 +583,8 @@ void InitElementGraphicInfo() { int default_graphic = element_info[i].graphic[ACTION_DEFAULT]; int default_crumbled = element_info[i].crumbled[ACTION_DEFAULT]; - int default_direction_graphic[NUM_DIRECTIONS]; - int default_direction_crumbled[NUM_DIRECTIONS]; + int default_direction_graphic[NUM_DIRECTIONS_FULL]; + int default_direction_crumbled[NUM_DIRECTIONS_FULL]; if (default_graphic == -1) default_graphic = IMG_UNKNOWN; @@ -580,7 +597,7 @@ void InitElementGraphicInfo() default_crumbled = IMG_EMPTY; #endif - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) { default_direction_graphic[dir] = element_info[i].direction_graphic[ACTION_DEFAULT][dir]; @@ -653,7 +670,7 @@ void InitElementGraphicInfo() default_action_crumbled = default_crumbled; #endif - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) { /* use action graphic as the default direction graphic, if undefined */ int default_action_direction_graphic = element_info[i].graphic[act]; @@ -712,6 +729,8 @@ void InitElementGraphicInfo() } } +#if 0 + /* !!! THIS ALSO CLEARS SPECIAL FLAGS (AND IS NOT NEEDED ANYWAY) !!! */ /* set animation mode to "none" for each graphic with only 1 frame */ for (i = 0; i < MAX_NUM_ELEMENTS; i++) { @@ -725,7 +744,7 @@ void InitElementGraphicInfo() if (graphic_info[crumbled].anim_frames == 1) graphic_info[crumbled].anim_mode = ANIM_NONE; - for (dir = 0; dir < NUM_DIRECTIONS; dir++) + for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++) { graphic = element_info[i].direction_graphic[act][dir]; crumbled = element_info[i].direction_crumbled[act][dir]; @@ -737,6 +756,7 @@ void InitElementGraphicInfo() } } } +#endif #if 0 #if DEBUG @@ -816,12 +836,12 @@ static int get_graphic_parameter_value(char *value_raw, char *suffix, int type) if (type != TYPE_TOKEN) return get_parameter_value(value_raw, suffix, type); - if (strcmp(value_raw, ARG_UNDEFINED) == 0) + if (strEqual(value_raw, ARG_UNDEFINED)) return ARG_UNDEFINED_VALUE; /* !!! OPTIMIZE THIS BY USING HASH !!! */ for (i = 0; i < MAX_NUM_ELEMENTS; i++) - if (strcmp(element_info[i].token_name, value_raw) == 0) + if (strEqual(element_info[i].token_name, value_raw)) return i; /* !!! OPTIMIZE THIS BY USING HASH !!! */ @@ -829,12 +849,12 @@ static int get_graphic_parameter_value(char *value_raw, char *suffix, int type) { int len_config_value = strlen(image_config[i].value); - if (strcmp(&image_config[i].value[len_config_value - 4], ".pcx") != 0 && - strcmp(&image_config[i].value[len_config_value - 4], ".wav") != 0 && - strcmp(image_config[i].value, UNDEFINED_FILENAME) != 0) + if (!strEqual(&image_config[i].value[len_config_value - 4], ".pcx") && + !strEqual(&image_config[i].value[len_config_value - 4], ".wav") && + !strEqual(image_config[i].value, UNDEFINED_FILENAME)) continue; - if (strcmp(image_config[i].token, value_raw) == 0) + if (strEqual(image_config[i].token, value_raw)) return x; x++; @@ -1055,8 +1075,8 @@ static void set_graphic_parameters(int graphic) graphic_info[graphic].step_delay = parameter[GFX_ARG_STEP_DELAY]; /* this is only used for drawing font characters */ - graphic_info[graphic].draw_x = parameter[GFX_ARG_DRAW_XOFFSET]; - graphic_info[graphic].draw_y = parameter[GFX_ARG_DRAW_YOFFSET]; + graphic_info[graphic].draw_xoffset = parameter[GFX_ARG_DRAW_XOFFSET]; + graphic_info[graphic].draw_yoffset = parameter[GFX_ARG_DRAW_YOFFSET]; /* this is only used for drawing envelope graphics */ graphic_info[graphic].draw_masked = parameter[GFX_ARG_DRAW_MASKED]; @@ -1282,8 +1302,8 @@ static void InitElementSoundInfo() element_info[element].sound[action] = sound; else for (j = 0; j < MAX_NUM_ELEMENTS; j++) - if (strcmp(element_info[j].class_name, - element_info[element].class_name) == 0) + if (strEqual(element_info[j].class_name, + element_info[element].class_name)) element_info[j].sound[action] = sound; } @@ -1301,8 +1321,8 @@ static void InitElementSoundInfo() action = ACTION_DEFAULT; for (j = 0; j < MAX_NUM_ELEMENTS; j++) - if (strcmp(element_info[j].class_name, - element_info[element_class].class_name) == 0) + if (strEqual(element_info[j].class_name, + element_info[element_class].class_name)) element_info[j].sound[action] = sound; } @@ -1457,8 +1477,8 @@ static void InitSoundInfo() int len_action_text = strlen(element_action_info[j].suffix); if (len_action_text < len_effect_text && - strcmp(&sound->token[len_effect_text - len_action_text], - element_action_info[j].suffix) == 0) + strEqual(&sound->token[len_effect_text - len_action_text], + element_action_info[j].suffix)) { sound_effect_properties[i] = element_action_info[j].value; sound_info[i].loop = element_action_info[j].is_loop_sound; @@ -1636,7 +1656,8 @@ static void ReinitializeGraphics() InitElementGraphicInfo(); /* element game graphic mapping */ InitElementSpecialGraphicInfo(); /* element special graphic mapping */ - InitElementSmallImages(); /* scale images to all needed sizes */ + InitElementSmallImages(); /* scale elements to all needed sizes */ + InitScaledImages(); /* scale all other images, if needed */ InitFontGraphicInfo(); /* initialize text drawing functions */ InitGraphicInfo_EM(); /* graphic mapping for EM engine */ @@ -1703,6 +1724,10 @@ static int get_special_property_bit(int element, int property_bit_nr) { EL_BD_FIREFLY_UP, 4 }, { EL_BD_FIREFLY_DOWN, 4 }, { EL_YAMYAM, 5 }, + { EL_YAMYAM_LEFT, 5 }, + { EL_YAMYAM_RIGHT, 5 }, + { EL_YAMYAM_UP, 5 }, + { EL_YAMYAM_DOWN, 5 }, { EL_DARK_YAMYAM, 6 }, { EL_ROBOT, 7 }, { EL_PACMAN, 8 }, @@ -1789,6 +1814,55 @@ boolean getBitfieldProperty(int *bitfield, int property_bit_nr, int element) return FALSE; } +#if 1 +static void resolve_group_element(int group_element, int recursion_depth) +{ + static int group_nr; + static struct ElementGroupInfo *group; + struct ElementGroupInfo *actual_group = element_info[group_element].group; + int i; + + if (actual_group == NULL) /* not yet initialized */ + return; + + if (recursion_depth > NUM_GROUP_ELEMENTS) /* recursion too deep */ + { + Error(ERR_WARN, "recursion too deep when resolving group element %d", + group_element - EL_GROUP_START + 1); + + /* replace element which caused too deep recursion by question mark */ + group->element_resolved[group->num_elements_resolved++] = EL_UNKNOWN; + + return; + } + + if (recursion_depth == 0) /* initialization */ + { + group = actual_group; + group_nr = group_element - EL_GROUP_START; + + group->num_elements_resolved = 0; + group->choice_pos = 0; + } + + for (i = 0; i < actual_group->num_elements; i++) + { + int element = actual_group->element[i]; + + if (group->num_elements_resolved == NUM_FILE_ELEMENTS) + break; + + if (IS_GROUP_ELEMENT(element)) + resolve_group_element(element, recursion_depth + 1); + else + { + group->element_resolved[group->num_elements_resolved++] = element; + element_info[element].in_group[group_nr] = TRUE; + } + } +} +#endif + void InitElementPropertiesStatic() { static int ep_diggable[] = @@ -1835,6 +1909,7 @@ void InitElementPropertiesStatic() EL_EMC_KEY_7, EL_EMC_KEY_8, EL_DYNAMITE, + EL_EM_DYNAMITE, EL_DYNABOMB_INCREASE_NUMBER, EL_DYNABOMB_INCREASE_SIZE, EL_DYNABOMB_INCREASE_POWER, @@ -2199,8 +2274,10 @@ void InitElementPropertiesStatic() EL_MOLE, /* new elements */ - EL_DYNAMITE_ACTIVE, EL_DYNAMITE, + EL_DYNAMITE_ACTIVE, + EL_EM_DYNAMITE, + EL_EM_DYNAMITE_ACTIVE, EL_DYNABOMB_PLAYER_1_ACTIVE, EL_DYNABOMB_PLAYER_2_ACTIVE, EL_DYNABOMB_PLAYER_3_ACTIVE, @@ -2480,8 +2557,10 @@ void InitElementPropertiesStatic() EL_MOLE, /* elements that can explode by explosion or by dragonfire */ - EL_DYNAMITE_ACTIVE, EL_DYNAMITE, + EL_DYNAMITE_ACTIVE, + EL_EM_DYNAMITE, + EL_EM_DYNAMITE_ACTIVE, EL_DYNABOMB_PLAYER_1_ACTIVE, EL_DYNABOMB_PLAYER_2_ACTIVE, EL_DYNABOMB_PLAYER_3_ACTIVE, @@ -3168,6 +3247,7 @@ void InitElementPropertiesStatic() EL_AMOEBA_DRY, EL_AMOEBA_FULL, EL_BD_AMOEBA, + EL_EMC_DRIPPER, -1 }; @@ -3178,6 +3258,7 @@ void InitElementPropertiesStatic() EL_AMOEBA_DRY, EL_AMOEBA_FULL, EL_BD_AMOEBA, + EL_EMC_DRIPPER, -1 }; @@ -3190,6 +3271,10 @@ void InitElementPropertiesStatic() EL_PLAYER_4, EL_SP_MURPHY, EL_YAMYAM, + EL_YAMYAM_LEFT, + EL_YAMYAM_RIGHT, + EL_YAMYAM_UP, + EL_YAMYAM_DOWN, EL_AMOEBA_WET, EL_AMOEBA_DRY, EL_AMOEBA_FULL, @@ -3215,6 +3300,7 @@ void InitElementPropertiesStatic() EL_AMOEBA_FULL, EL_GAME_OF_LIFE, EL_BIOMAZE, + EL_EMC_DRIPPER, -1 }; @@ -3222,6 +3308,7 @@ void InitElementPropertiesStatic() static int ep_active_bomb[] = { EL_DYNAMITE_ACTIVE, + EL_EM_DYNAMITE_ACTIVE, EL_DYNABOMB_PLAYER_1_ACTIVE, EL_DYNABOMB_PLAYER_2_ACTIVE, EL_DYNABOMB_PLAYER_3_ACTIVE, @@ -3292,6 +3379,7 @@ void InitElementPropertiesStatic() EL_EMC_GATE_7_GRAY_ACTIVE, EL_EMC_GATE_8_GRAY_ACTIVE, EL_DYNAMITE, + EL_EM_DYNAMITE, EL_INVISIBLE_STEELWALL, EL_INVISIBLE_WALL, EL_INVISIBLE_SAND, @@ -3604,6 +3692,17 @@ void InitElementPropertiesEngine(int engine_version) property (which means that conditional property changes must be set to a reliable default value before) */ +#if 1 + /* ---------- recursively resolve group elements ------------------------- */ + + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + for (j = 0; j < NUM_GROUP_ELEMENTS; j++) + element_info[i].in_group[j] = FALSE; + + for (i = 0; i < NUM_GROUP_ELEMENTS; i++) + resolve_group_element(EL_GROUP_START + i, 0); +#endif + /* set all special, combined or engine dependent element properties */ for (i = 0; i < MAX_NUM_ELEMENTS; i++) { @@ -3743,6 +3842,12 @@ void InitElementPropertiesEngine(int engine_version) SET_PROPERTY(i, EP_SP_PORT, (IS_SP_ELEMENT(i) && IS_PASSABLE_INSIDE(i))); + /* ---------- CAN_BE_CLONED_BY_ANDROID --------------------------------- */ + for (j = 0; j < level.num_android_clone_elements; j++) + SET_PROPERTY(i, EP_CAN_BE_CLONED_BY_ANDROID, + (i != EL_EMPTY && + IS_EQUAL_OR_IN_GROUP(i, level.android_clone_element[j]))); + /* ---------- CAN_CHANGE ----------------------------------------------- */ SET_PROPERTY(i, EP_CAN_CHANGE, FALSE); /* default: cannot change */ for (j = 0; j < element_info[i].num_change_pages; j++) @@ -3877,7 +3982,7 @@ void Execute_Command(char *command) { int i; - if (strcmp(command, "print graphicsinfo.conf") == 0) + if (strEqual(command, "print graphicsinfo.conf")) { printf("# You can configure additional/alternative image files here.\n"); printf("# (The entries below are default and therefore commented out.)\n"); @@ -3893,7 +3998,7 @@ void Execute_Command(char *command) exit(0); } - else if (strcmp(command, "print soundsinfo.conf") == 0) + else if (strEqual(command, "print soundsinfo.conf")) { printf("# You can configure additional/alternative sound files here.\n"); printf("# (The entries below are default and therefore commented out.)\n"); @@ -3909,7 +4014,7 @@ void Execute_Command(char *command) exit(0); } - else if (strcmp(command, "print musicinfo.conf") == 0) + else if (strEqual(command, "print musicinfo.conf")) { printf("# You can configure additional/alternative music files here.\n"); printf("# (The entries below are default and therefore commented out.)\n"); @@ -3925,7 +4030,7 @@ void Execute_Command(char *command) exit(0); } - else if (strcmp(command, "print editorsetup.conf") == 0) + else if (strEqual(command, "print editorsetup.conf")) { printf("# You can configure your personal editor element list here.\n"); printf("# (The entries below are default and therefore commented out.)\n"); @@ -3939,7 +4044,7 @@ void Execute_Command(char *command) exit(0); } - else if (strcmp(command, "print helpanim.conf") == 0) + else if (strEqual(command, "print helpanim.conf")) { printf("# You can configure different element help animations here.\n"); printf("# (The entries below are default and therefore commented out.)\n"); @@ -3950,13 +4055,13 @@ void Execute_Command(char *command) printf("# %s\n", getFormattedSetupEntry(helpanim_config[i].token, helpanim_config[i].value)); - if (strcmp(helpanim_config[i].token, "end") == 0) + if (strEqual(helpanim_config[i].token, "end")) printf("#\n"); } exit(0); } - else if (strcmp(command, "print helptext.conf") == 0) + else if (strEqual(command, "print helptext.conf")) { printf("# You can configure different element help text here.\n"); printf("# (The entries below are default and therefore commented out.)\n"); @@ -4130,7 +4235,7 @@ static void InitArtworkConfig() static char *sound_id_prefix[2 * MAX_NUM_ELEMENTS + 1]; static char *music_id_prefix[NUM_MUSIC_PREFIXES + 1]; static char *action_id_suffix[NUM_ACTIONS + 1]; - static char *direction_id_suffix[NUM_DIRECTIONS + 1]; + static char *direction_id_suffix[NUM_DIRECTIONS_FULL + 1]; static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1]; static char *level_id_suffix[MAX_LEVELS + 1]; static char *dummy[1] = { NULL }; @@ -4204,9 +4309,9 @@ static void InitArtworkConfig() action_id_suffix[i] = element_action_info[i].suffix; action_id_suffix[NUM_ACTIONS] = NULL; - for (i = 0; i < NUM_DIRECTIONS; i++) + for (i = 0; i < NUM_DIRECTIONS_FULL; i++) direction_id_suffix[i] = element_direction_info[i].suffix; - direction_id_suffix[NUM_DIRECTIONS] = NULL; + direction_id_suffix[NUM_DIRECTIONS_FULL] = NULL; for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) special_id_suffix[i] = special_suffix_info[i].suffix; @@ -4250,18 +4355,18 @@ void InitGfx() sprintf(font_token, "%s_%d", CONFIG_TOKEN_FONT_INITIAL, j + 1); len_font_token = strlen(font_token); - if (strcmp(image_config[i].token, font_token) == 0) + if (strEqual(image_config[i].token, font_token)) filename_font_initial = image_config[i].value; else if (strlen(image_config[i].token) > len_font_token && strncmp(image_config[i].token, font_token, len_font_token) == 0) { - if (strcmp(&image_config[i].token[len_font_token], ".x") == 0) + if (strEqual(&image_config[i].token[len_font_token], ".x")) font_initial[j].src_x = atoi(image_config[i].value); - else if (strcmp(&image_config[i].token[len_font_token], ".y") == 0) + else if (strEqual(&image_config[i].token[len_font_token], ".y")) font_initial[j].src_y = atoi(image_config[i].value); - else if (strcmp(&image_config[i].token[len_font_token], ".width") == 0) + else if (strEqual(&image_config[i].token[len_font_token], ".width")) font_initial[j].width = atoi(image_config[i].value); - else if (strcmp(&image_config[i].token[len_font_token],".height") == 0) + else if (strEqual(&image_config[i].token[len_font_token],".height")) font_initial[j].height = atoi(image_config[i].value); } } @@ -4276,7 +4381,8 @@ void InitGfx() if (filename_font_initial == NULL) /* should not happen */ Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_FONT_INITIAL); - /* create additional image buffers for double-buffering */ + /* create additional image buffers for double-buffering and cross-fading */ + bitmap_db_title = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); bitmap_db_field = CreateBitmap(FXSIZE, FYSIZE, DEFAULT_DEPTH); bitmap_db_door = CreateBitmap(3 * DXSIZE, DYSIZE + VYSIZE, DEFAULT_DEPTH); @@ -4301,6 +4407,14 @@ void InitGfx() DrawInitText("Loading graphics:", 120, FC_GREEN); } +void RedrawBackground() +{ + BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer, + 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + + redraw_mask = REDRAW_ALL; +} + void InitGfxBackground() { int x, y; @@ -4309,8 +4423,8 @@ void InitGfxBackground() fieldbuffer = bitmap_db_field; SetDrawtoField(DRAW_BACKBUFFER); - BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer, - 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + RedrawBackground(); + ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE); @@ -4481,8 +4595,8 @@ static char *getNewArtworkIdentifier(int type) #endif /* ---------- reload if current artwork identifier has changed ----------- */ - if (strcmp(ARTWORK_CURRENT_IDENTIFIER(artwork, type), - artwork_current_identifier) != 0) + if (!strEqual(ARTWORK_CURRENT_IDENTIFIER(artwork, type), + artwork_current_identifier)) artwork_new_identifier = artwork_current_identifier; *(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type))= artwork_current_identifier; @@ -4516,14 +4630,20 @@ static char *getNewArtworkIdentifier(int type) void ReloadCustomArtwork(int force_reload) { - char *gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS); - char *snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS); - char *mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC); + char *gfx_new_identifier; + char *snd_new_identifier; + char *mus_new_identifier; boolean force_reload_gfx = (force_reload & (1 << ARTWORK_TYPE_GRAPHICS)); boolean force_reload_snd = (force_reload & (1 << ARTWORK_TYPE_SOUNDS)); boolean force_reload_mus = (force_reload & (1 << ARTWORK_TYPE_MUSIC)); boolean redraw_screen = FALSE; + force_reload_gfx |= AdjustGraphicsForEMC(); + + gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS); + snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS); + mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC); + if (gfx_new_identifier != NULL || force_reload_gfx) { #if 0 @@ -4561,7 +4681,11 @@ void ReloadCustomArtwork(int force_reload) if (redraw_screen) { +#if 1 + RedrawBackground(); +#else InitGfxBackground(); +#endif /* force redraw of (open or closed) door graphics */ SetDoorState(DOOR_OPEN_ALL);