for (act=0; act<NUM_ACTIONS; act++)
{
element_info[i].graphic[act] = -1;
+ element_info[i].crumbled[act] = -1;
for (dir=0; dir<NUM_DIRECTIONS; dir++)
+ {
element_info[i].direction_graphic[act][dir] = -1;
+ element_info[i].direction_crumbled[act][dir] = -1;
+ }
}
}
/* initialize normal element/graphic mapping from static configuration */
for (i=0; element_to_graphic[i].element > -1; i++)
{
- int element = element_to_graphic[i].element;
- int action = element_to_graphic[i].action;
- int direction = element_to_graphic[i].direction;
- int graphic = element_to_graphic[i].graphic;
+ int element = element_to_graphic[i].element;
+ int action = element_to_graphic[i].action;
+ int direction = element_to_graphic[i].direction;
+ boolean crumbled = element_to_graphic[i].crumbled;
+ int graphic = element_to_graphic[i].graphic;
if (graphic_info[graphic].bitmap == NULL)
continue;
- if ((action > -1 || direction > -1) && el2img(element) != -1)
+ if ((action > -1 || direction > -1 || crumbled == TRUE) &&
+ el2img(element) != -1)
{
boolean base_redefined = getImageListEntry(el2img(element))->redefined;
boolean act_dir_redefined = getImageListEntry(graphic)->redefined;
if (action < 0)
action = ACTION_DEFAULT;
- if (direction > -1)
- element_info[element].direction_graphic[action][direction] = graphic;
+ if (crumbled)
+ {
+ if (direction > -1)
+ element_info[element].direction_crumbled[action][direction] = graphic;
+ else
+ element_info[element].crumbled[action] = graphic;
+ }
else
- element_info[element].graphic[action] = graphic;
+ {
+ if (direction > -1)
+ element_info[element].direction_graphic[action][direction] = graphic;
+ else
+ element_info[element].graphic[action] = graphic;
+ }
}
/* initialize normal element/graphic mapping from dynamic configuration */
int direction = property_mapping[i].ext2_index;
int special = property_mapping[i].ext3_index;
int graphic = property_mapping[i].artwork_index;
+ boolean crumbled = FALSE;
+
+ if (special == GFX_SPECIAL_ARG_CRUMBLED)
+ {
+ special = -1;
+ crumbled = TRUE;
+ }
if (graphic_info[graphic].bitmap == NULL)
continue;
if (action < 0)
action = ACTION_DEFAULT;
- if (direction < 0)
- for (dir=0; dir<NUM_DIRECTIONS; dir++)
- element_info[element].direction_graphic[action][dir] = -1;
-
- if (direction > -1)
- element_info[element].direction_graphic[action][direction] = graphic;
+ if (crumbled)
+ {
+ if (direction < 0)
+ for (dir=0; dir<NUM_DIRECTIONS; dir++)
+ element_info[element].direction_crumbled[action][dir] = -1;
+
+ if (direction > -1)
+ element_info[element].direction_crumbled[action][direction] = graphic;
+ else
+ element_info[element].crumbled[action] = graphic;
+ }
else
- element_info[element].graphic[action] = graphic;
+ {
+ if (direction < 0)
+ for (dir=0; dir<NUM_DIRECTIONS; dir++)
+ element_info[element].direction_graphic[action][dir] = -1;
+
+ if (direction > -1)
+ element_info[element].direction_graphic[action][direction] = graphic;
+ else
+ element_info[element].graphic[action] = graphic;
+ }
+ }
+
+ /* now copy all graphics that are defined to be cloned from other graphics */
+ for (i=0; i<MAX_NUM_ELEMENTS; i++)
+ {
+ int graphic = element_info[i].graphic[ACTION_DEFAULT];
+ int crumbled_like, diggable_like;
+
+ if (graphic == -1)
+ continue;
+
+ crumbled_like = graphic_info[graphic].crumbled_like;
+ diggable_like = graphic_info[graphic].diggable_like;
+
+ if (crumbled_like != -1 && element_info[i].crumbled[ACTION_DEFAULT] == -1)
+ {
+ for (act=0; act<NUM_ACTIONS; act++)
+ 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++)
+ element_info[i].direction_crumbled[act][dir] =
+ element_info[crumbled_like].direction_crumbled[act][dir];
+ }
+
+ if (diggable_like != -1 && element_info[i].graphic[ACTION_DIGGING] == -1)
+ {
+ element_info[i].graphic[ACTION_DIGGING] =
+ element_info[diggable_like].graphic[ACTION_DIGGING];
+ for (dir=0; dir<NUM_DIRECTIONS; dir++)
+ element_info[i].direction_graphic[ACTION_DIGGING][dir] =
+ element_info[diggable_like].direction_graphic[ACTION_DIGGING][dir];
+ }
}
/* now set all '-1' values to element specific default values */
for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
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];
if (default_graphic == -1)
default_graphic = IMG_CHAR_QUESTION;
+ if (default_crumbled == -1)
+ default_crumbled = IMG_EMPTY;
for (dir=0; dir<NUM_DIRECTIONS; dir++)
{
default_direction_graphic[dir] =
element_info[i].direction_graphic[ACTION_DEFAULT][dir];
+ default_direction_crumbled[dir] =
+ element_info[i].direction_crumbled[ACTION_DEFAULT][dir];
if (default_direction_graphic[dir] == -1)
default_direction_graphic[dir] = default_graphic;
+ if (default_direction_crumbled[dir] == -1)
+ default_direction_crumbled[dir] = default_crumbled;
}
for (act=0; act<NUM_ACTIONS; act++)
/* generic default action graphic (defined by "[default]" directive) */
int default_action_graphic = element_info[EL_DEFAULT].graphic[act];
+ int default_action_crumbled = element_info[EL_DEFAULT].crumbled[act];
/* look for special default action graphic (classic game specific) */
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].graphic[act] != -1)
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].graphic[act] != -1)
default_action_graphic = element_info[EL_SB_DEFAULT].graphic[act];
+ if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].crumbled[act] != -1)
+ default_action_crumbled = element_info[EL_BD_DEFAULT].crumbled[act];
+ if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].crumbled[act] != -1)
+ default_action_crumbled = element_info[EL_SP_DEFAULT].crumbled[act];
+ if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].crumbled[act] != -1)
+ default_action_crumbled = element_info[EL_SB_DEFAULT].crumbled[act];
+
if (default_action_graphic == -1)
default_action_graphic = default_graphic;
+ if (default_action_crumbled == -1)
+ default_action_crumbled = default_crumbled;
for (dir=0; dir<NUM_DIRECTIONS; dir++)
{
int default_action_direction_graphic = element_info[i].graphic[act];
+ int default_action_direction_crumbled = element_info[i].crumbled[act];
/* no graphic for current action -- use default direction graphic */
if (default_action_direction_graphic == -1)
default_action_direction_graphic =
(act_remove ? IMG_EMPTY : default_direction_graphic[dir]);
+ if (default_action_direction_crumbled == -1)
+ default_action_direction_crumbled =
+ (act_remove ? IMG_EMPTY : default_direction_crumbled[dir]);
if (element_info[i].direction_graphic[act][dir] == -1)
element_info[i].direction_graphic[act][dir] =
default_action_direction_graphic;
+ if (element_info[i].direction_crumbled[act][dir] == -1)
+ element_info[i].direction_crumbled[act][dir] =
+ default_action_direction_crumbled;
}
/* no graphic for this specific action -- use default action graphic */
if (element_info[i].graphic[act] == -1)
element_info[i].graphic[act] =
(act_remove ? IMG_EMPTY : default_action_graphic);
+ if (element_info[i].crumbled[act] == -1)
+ element_info[i].crumbled[act] =
+ (act_remove ? IMG_EMPTY : default_action_crumbled);
}
}
}
}
+static int get_element_from_token(char *token)
+{
+ int i;
+
+ for (i=0; i < MAX_NUM_ELEMENTS; i++)
+ if (strcmp(element_info[i].token_name, token) == 0)
+ return i;
+
+ return -1;
+}
+
static void set_graphic_parameters(int graphic, char **parameter_raw)
{
Bitmap *src_bitmap = getBitmapFromImageID(graphic);
/* get integer values from string parameters */
for (i=0; i < NUM_GFX_ARGS; i++)
+ {
parameter[i] =
get_parameter_value(image_config_suffix[i].token, parameter_raw[i],
image_config_suffix[i].type);
+ if (image_config_suffix[i].type == TYPE_TOKEN)
+ parameter[i] = get_element_from_token(parameter_raw[i]);
+ }
+
graphic_info[graphic].bitmap = src_bitmap;
/* start with reliable default values */
graphic_info[graphic].height = TILEY;
graphic_info[graphic].offset_x = 0; /* one or both of these values ... */
graphic_info[graphic].offset_y = 0; /* ... will be corrected later */
+ graphic_info[graphic].crumbled_like = -1; /* do not use clone element */
+ graphic_info[graphic].diggable_like = -1; /* do not use clone element */
/* optional x and y tile position of animation frame sequence */
if (parameter[GFX_ARG_XPOS] != ARG_UNDEFINED_VALUE)
/* animation synchronized with global frame counter, not move position */
graphic_info[graphic].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
+ /* optional element for cloning crumble graphics */
+ if (parameter[GFX_ARG_CRUMBLED_LIKE] != ARG_UNDEFINED_VALUE)
+ graphic_info[graphic].crumbled_like = parameter[GFX_ARG_CRUMBLED_LIKE];
+
+ /* optional element for cloning digging graphics */
+ if (parameter[GFX_ARG_DIGGABLE_LIKE] != ARG_UNDEFINED_VALUE)
+ graphic_info[graphic].diggable_like = parameter[GFX_ARG_DIGGABLE_LIKE];
+
/* this is only used for toon animations */
graphic_info[graphic].step_offset = parameter[GFX_ARG_STEP_OFFSET];
graphic_info[graphic].step_delay = parameter[GFX_ARG_STEP_DELAY];
int src_x, src_y;
int first_frame, last_frame;
+#if 0
+ printf("::: image: '%s'\n", image->token);
+#endif
+
+#if 0
+ printf("::: image # %d: '%s' ['%s']\n",
+ i, image->token,
+ getTokenFromImageID(i));
+#endif
+
set_graphic_parameters(i, image->parameter);
/* now check if no animation frames are outside of the loaded image */
sound_effect_properties[i] = ACTION_OTHER;
sound_info[i].loop = FALSE;
+#if 0
+ printf("::: sound %d: '%s'\n", i, sound->token);
+#endif
+
/* determine all loop sounds and identify certain sound classes */
for (j=0; element_action_info[j].suffix; j++)
element_action_info[j].suffix) == 0)
{
sound_effect_properties[i] = element_action_info[j].value;
+ sound_info[i].loop = element_action_info[j].is_loop_sound;
- if (element_action_info[j].is_loop_sound)
- sound_info[i].loop = TRUE;
+ break;
}
}
+#if 0
+ if (strcmp(sound->token, "custom_42") == 0)
+ printf("::: '%s' -> %d\n", sound->token, sound_info[i].loop);
+#endif
+
/* associate elements and some selected sound actions */
for (j=0; j<MAX_NUM_ELEMENTS; j++)
/* ---------- 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)));
+
+ /* ---------- CAN_BE_CRUMBLED ------------------------------------------ */
+ SET_PROPERTY(i, EP_CAN_BE_CRUMBLED,
+ element_info[i].crumbled[ACTION_DEFAULT] != IMG_EMPTY);
+
+#if 0
+ if (CAN_BE_CRUMBLED(i))
+ printf("::: '%s' can be crumbled [%d]\n",
+ element_info[i].token_name,
+ element_info[i].crumbled[ACTION_DEFAULT]);
+#endif
}
#if 0
static void InitImages()
{
+#if 1
+ setLevelArtworkDir(artwork.gfx_first);
+#endif
+
+#if 0
+ printf("::: InitImages ['%s', '%s'] ['%s', '%s']\n",
+ artwork.gfx_current_identifier,
+ artwork.gfx_current->identifier,
+ leveldir_current->graphics_set,
+ leveldir_current->graphics_path);
+#endif
+
ReloadCustomImages();
LoadCustomElementDescriptions();
static void InitSound()
{
+ setLevelArtworkDir(artwork.snd_first);
+
InitReloadCustomSounds(artwork.snd_current->identifier);
ReinitializeSounds();
}
static void InitMusic()
{
+ setLevelArtworkDir(artwork.mus_first);
+
InitReloadCustomMusic(artwork.mus_current->identifier);
ReinitializeMusic();
}
static boolean last_override_level_graphics = FALSE;
static boolean last_override_level_sounds = FALSE;
static boolean last_override_level_music = FALSE;
+ static boolean last_own_level_graphics_set = FALSE;
+ static boolean last_own_level_sounds_set = FALSE;
+ static boolean last_own_level_music_set = FALSE;
+ boolean level_graphics_set_changed = FALSE;
+ boolean level_sounds_set_changed = FALSE;
+ boolean level_music_set_changed = 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
leveldir_current_identifier = leveldir_current->identifier;
#endif
-#if 1
+#if 0
printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier,
leveldir_current->graphics_set);
printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier,
leveldir_current->identifier);
#endif
-#if 1
+#if 0
printf("graphics --> '%s' ('%s')\n",
artwork.gfx_current_identifier, artwork.gfx_current->filename);
-#endif
-#if 0
printf("sounds --> '%s' ('%s')\n",
artwork.snd_current_identifier, artwork.snd_current->filename);
printf("music --> '%s' ('%s')\n",
/* 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;
+#endif
char *identifier_new = leveldir_current->identifier;
-#if 1
+#if 0
printf("::: 1: ['%s'] '%s', '%s' [%lx, %lx]\n",
gfx_new_identifier, identifier_old, identifier_new,
getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old),
getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
gfx_new_identifier = identifier_new;
#else
- if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new) == NULL)
- gfx_new_identifier = setup.graphics_set;
- else
+ if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
gfx_new_identifier = identifier_new;
+ else
+ gfx_new_identifier = setup.graphics_set;
#endif
-#if 1
- if (leveldir_current_identifier == NULL)
- leveldir_current_identifier = leveldir_current->identifier;
-#endif
-
+#if 0
if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_new) == NULL)
snd_new_identifier = SOUNDS_SUBDIR;
else if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) !=
getTreeInfoFromIdentifier(artwork.snd_first, identifier_new))
snd_new_identifier = identifier_new;
+#else
+ if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_new))
+ snd_new_identifier = identifier_new;
+ else
+ snd_new_identifier = setup.sounds_set;
+#endif
+#if 0
if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) == NULL)
mus_new_identifier = MUSIC_SUBDIR;
else if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) !=
getTreeInfoFromIdentifier(artwork.mus_first, identifier_new))
mus_new_identifier = identifier_new;
+#else
+ if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new))
+ mus_new_identifier = identifier_new;
+ else
+ mus_new_identifier = setup.music_set;
+#endif
-#if 1
+#if 0
printf("::: 2: ['%s'] '%s', '%s'\n",
gfx_new_identifier, identifier_old, identifier_new);
#endif
+#if 0
leveldir_current_identifier = leveldir_current->identifier;
+#endif
}
/* custom level artwork configured in level series configuration file
always overrides custom level artwork stored in level series directory
- and (level independent) custom artwork configured in setup menue */
+ and (level independent) custom artwork configured in setup menu */
if (leveldir_current->graphics_set != NULL)
gfx_new_identifier = leveldir_current->graphics_set;
if (leveldir_current->sounds_set != NULL)
if (leveldir_current->music_set != NULL)
mus_new_identifier = leveldir_current->music_set;
+ if (leveldir_current_identifier != leveldir_current->identifier)
+ {
+ if (last_own_level_graphics_set || leveldir_current->graphics_set != NULL)
+ level_graphics_set_changed = TRUE;
+
+ if (last_own_level_sounds_set || leveldir_current->sounds_set != NULL)
+ level_sounds_set_changed = TRUE;
+
+ if (last_own_level_music_set || leveldir_current->music_set != NULL)
+ level_music_set_changed = TRUE;
+
+ last_own_level_graphics_set = (leveldir_current->graphics_set != NULL);
+ last_own_level_sounds_set = (leveldir_current->sounds_set != NULL);
+ last_own_level_music_set = (leveldir_current->music_set != NULL);
+ }
+
#if 1
- printf("CHECKING OLD/NEW GFX:\n OLD: '%s'\n NEW: '%s' ['%s', '%s']\n",
+ leveldir_current_identifier = leveldir_current->identifier;
+#endif
+
+ if (setup.override_level_graphics)
+ gfx_new_identifier = artwork.gfx_current->identifier;
+ if (setup.override_level_sounds)
+ snd_new_identifier = artwork.snd_current->identifier;
+ if (setup.override_level_music)
+ mus_new_identifier = artwork.mus_current->identifier;
+
+
+#if 0
+ printf("CHECKING OLD/NEW GFX:\n OLD: '%s'\n NEW: '%s' ['%s', '%s'] [%d]\n",
artwork.gfx_current_identifier, gfx_new_identifier,
- artwork.gfx_current->identifier, leveldir_current->graphics_set);
+ artwork.gfx_current->identifier, leveldir_current->graphics_set,
+ level_graphics_set_changed);
#endif
if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 ||
- last_override_level_graphics != setup.override_level_graphics)
+ last_override_level_graphics != setup.override_level_graphics ||
+ level_graphics_set_changed)
{
+#if 0
+ printf("RELOADING GRAPHICS '%s' -> '%s' ['%s']\n",
+ artwork.gfx_current_identifier,
+ gfx_new_identifier,
+ artwork.gfx_current->identifier);
+#endif
+
#if 0
artwork.gfx_current =
getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier);
#endif
-#if 1
+#if 0
artwork.gfx_current_identifier = gfx_new_identifier;
#endif
-#if 1
- printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n",
- artwork.gfx_current_identifier,
- artwork.gfx_current->identifier,
- gfx_new_identifier);
-#endif
-
+#if 0
setLevelArtworkDir(artwork.gfx_first);
+#endif
ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
InitImages();
+#if 0
+ printf("::: %d\n", menu.list_size[GAME_MODE_LEVELS]);
+#endif
+
FreeTileClipmasks();
InitTileClipmasks();
#if 0
artwork.gfx_current =
getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier);
#endif
+#if 0
printf("::: '%s', %lx\n", gfx_new_identifier, artwork.gfx_current);
+#endif
#if 0
artwork.gfx_current_identifier = artwork.gfx_current->identifier;
#endif
+ artwork.gfx_current_identifier = gfx_new_identifier;
last_override_level_graphics = setup.override_level_graphics;
#if 0
}
if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
- last_override_level_sounds != setup.override_level_sounds)
+ last_override_level_sounds != setup.override_level_sounds ||
+ level_sounds_set_changed)
{
#if 0
printf("RELOADING SOUNDS '%s' -> '%s' ('%s')\n",
/* set artwork path to send it to the sound server process */
setLevelArtworkDir(artwork.snd_first);
+ ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
+
InitReloadCustomSounds(snd_new_identifier);
ReinitializeSounds();
+#if 0
artwork.snd_current =
getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set);
artwork.snd_current_identifier = artwork.snd_current->identifier;
+#endif
+ artwork.snd_current_identifier = snd_new_identifier;
last_override_level_sounds = setup.override_level_sounds;
redraw_screen = TRUE;
}
if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
- last_override_level_music != setup.override_level_music)
+ last_override_level_music != setup.override_level_music ||
+ level_music_set_changed)
{
/* set artwork path to send it to the sound server process */
setLevelArtworkDir(artwork.mus_first);
+ ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
+
InitReloadCustomMusic(mus_new_identifier);
ReinitializeMusic();
+#if 0
artwork.mus_current =
getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set);
artwork.mus_current_identifier = artwork.mus_current->identifier;
+#endif
+ artwork.mus_current_identifier = mus_new_identifier;
last_override_level_music = setup.override_level_music;
redraw_screen = TRUE;
projects / rocksndiamonds.git / blobdiff