/* now set all '-1' values to element specific default values */
for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
- int default_action_graphic = element_info[i].graphic[ACTION_DEFAULT];
- int default_action_direction_graphic[NUM_DIRECTIONS];
+ int default_graphic = element_info[i].graphic[ACTION_DEFAULT];
+ int default_direction_graphic[NUM_DIRECTIONS];
- if (default_action_graphic == -1)
- default_action_graphic = IMG_CHAR_QUESTION;
+ if (default_graphic == -1)
+ default_graphic = IMG_CHAR_QUESTION;
for (dir=0; dir<NUM_DIRECTIONS; dir++)
{
- default_action_direction_graphic[dir] =
+ default_direction_graphic[dir] =
element_info[i].direction_graphic[ACTION_DEFAULT][dir];
- if (default_action_direction_graphic[dir] == -1)
- default_action_direction_graphic[dir] = default_action_graphic;
+ if (default_direction_graphic[dir] == -1)
+ default_direction_graphic[dir] = default_graphic;
}
for (act=0; act<NUM_ACTIONS; act++)
act == ACTION_SNAPPING ||
act == ACTION_COLLECTING);
+ /* generic default action graphic (defined by "[default]" directive) */
+ int default_action_graphic = element_info[EL_DEFAULT].graphic[act];
+
+ /* look for special default action graphic (classic game specific) */
+ if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].graphic[act] != -1)
+ default_action_graphic = element_info[EL_BD_DEFAULT].graphic[act];
+ if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].graphic[act] != -1)
+ default_action_graphic = element_info[EL_SP_DEFAULT].graphic[act];
+ if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].graphic[act] != -1)
+ default_action_graphic = element_info[EL_SB_DEFAULT].graphic[act];
+
+ if (default_action_graphic == -1)
+ default_action_graphic = default_graphic;
+
for (dir=0; dir<NUM_DIRECTIONS; dir++)
{
- int default_direction_graphic = element_info[i].graphic[act];
+ int default_action_direction_graphic = element_info[i].graphic[act];
/* no graphic for current action -- use default direction graphic */
- if (default_direction_graphic == -1)
- default_direction_graphic =
- (act_remove ? IMG_EMPTY : default_action_direction_graphic[dir]);
+ if (default_action_direction_graphic == -1)
+ default_action_direction_graphic =
+ (act_remove ? IMG_EMPTY : default_direction_graphic[dir]);
if (element_info[i].direction_graphic[act][dir] == -1)
element_info[i].direction_graphic[act][dir] =
- default_direction_graphic;
+ default_action_direction_graphic;
}
/* no graphic for this specific action -- use default action graphic */
anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height;
}
- /* correct x or y offset dependant of vertical or horizontal frame order */
+ /* correct x or y offset dependent of vertical or horizontal frame order */
if (parameter[GFX_ARG_VERTICAL]) /* frames are ordered vertically */
{
graphic_info[graphic].offset_y =
int src_x, src_y;
int first_frame, last_frame;
+#if 0
+ printf("::: image: '%s'\n", image->token);
+#endif
+
set_graphic_parameters(i, image->parameter);
/* now check if no animation frames are outside of the loaded image */
element_info[j].sound[action] = sound;
}
- /* initialize element/sound mapping from dynamic configuration */
+ /* initialize element class/sound mapping from dynamic configuration */
for (i=0; i < num_property_mappings; i++)
{
- int element = property_mapping[i].base_index;
- int action = property_mapping[i].ext1_index;
- int sound = property_mapping[i].artwork_index;
+ int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
+ int action = property_mapping[i].ext1_index;
+ int sound = property_mapping[i].artwork_index;
- if (element >= MAX_NUM_ELEMENTS)
+ if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS)
continue;
if (action < 0)
action = ACTION_DEFAULT;
- element_info[element].sound[action] = sound;
+ for (j=0; j < MAX_NUM_ELEMENTS; j++)
+ if (strcmp(element_info[j].class_name,
+ element_info[element_class].class_name) == 0)
+ element_info[j].sound[action] = sound;
}
- /* initialize element class/sound mapping from dynamic configuration */
+ /* initialize element/sound mapping from dynamic configuration */
for (i=0; i < num_property_mappings; i++)
{
- int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
- int action = property_mapping[i].ext1_index;
- int sound = property_mapping[i].artwork_index;
+ int element = property_mapping[i].base_index;
+ int action = property_mapping[i].ext1_index;
+ int sound = property_mapping[i].artwork_index;
- if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS)
+ if (element >= MAX_NUM_ELEMENTS)
continue;
if (action < 0)
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)
- element_info[j].sound[action] = sound;
+ element_info[element].sound[action] = sound;
}
/* now set all '-1' values to element specific default values */
for (i=0; i<MAX_NUM_ELEMENTS; i++)
{
- int default_action_sound = element_info[i].sound[ACTION_DEFAULT];
-
for (act=0; act < NUM_ACTIONS; act++)
{
+ /* generic default action sound (defined by "[default]" directive) */
+ int default_action_sound = element_info[EL_DEFAULT].sound[act];
+
+ /* look for special default action sound (classic game specific) */
+ if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].sound[act] != -1)
+ default_action_sound = element_info[EL_BD_DEFAULT].sound[act];
+ if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].sound[act] != -1)
+ default_action_sound = element_info[EL_SP_DEFAULT].sound[act];
+ if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].sound[act] != -1)
+ default_action_sound = element_info[EL_SB_DEFAULT].sound[act];
+
+ /* look for element specific default sound (independent from action) */
+ if (element_info[i].sound[ACTION_DEFAULT] != -1)
+ default_action_sound = element_info[i].sound[ACTION_DEFAULT];
+
/* no sound for this specific action -- use default action sound */
if (element_info[i].sound[act] == -1)
element_info[i].sound[act] = default_action_sound;
static void InitSoundInfo()
{
+#if 0
struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
int num_property_mappings = getSoundListPropertyMappingSize();
+#endif
int *sound_effect_properties;
int num_sounds = getSoundListSize();
int i, j;
sound_effect_properties[i] = ACTION_OTHER;
sound_info[i].loop = FALSE;
+#if 0
+ printf("::: sound: '%s'\n", sound->token);
+#endif
+
/* determine all loop sounds and identify certain sound classes */
for (j=0; element_action_info[j].suffix; j++)
}
}
+#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++)
free(sound_effect_properties);
+#if 0
+ /* !!! now handled in InitElementSoundInfo() !!! */
/* initialize element/sound mapping from dynamic configuration */
for (i=0; i < num_property_mappings; i++)
{
if (action < 0)
action = ACTION_DEFAULT;
+ printf("::: %d: %d, %d, %d ['%s']\n",
+ i, element, action, sound, element_info[element].token_name);
+
element_info[element].sound[action] = sound;
}
+#endif
#if 0
/* TEST ONLY */
InitSoundInfo(); /* sound properties mapping */
InitElementSoundInfo(); /* element game sound mapping */
-#if 1
- InitElementSoundInfo(); /* element game sound mapping */
-#endif
-
InitPlaySoundLevel(); /* internal game sound settings */
}
EL_GATE_2_GRAY,
EL_GATE_3_GRAY,
EL_GATE_4_GRAY,
+ EL_PENGUIN,
+ EL_PIG,
+ EL_DRAGON,
-1
};
EL_INVISIBLE_WALL,
/* more than one murphy in a level results in an inactive clone */
EL_SP_MURPHY_CLONE,
+ /* runtime elements*/
+ EL_SP_DISK_RED_ACTIVE,
+ EL_SP_TERMINAL_ACTIVE,
+ EL_SP_BUGGY_BASE_ACTIVATING,
+ EL_SP_BUGGY_BASE_ACTIVE,
-1
};
EL_DYNABOMB_INCREASE_NUMBER,
EL_DYNABOMB_INCREASE_SIZE,
EL_DYNABOMB_INCREASE_POWER,
+#if 0
EL_SOKOBAN_OBJECT,
+#endif
EL_SOKOBAN_FIELD_EMPTY,
EL_SOKOBAN_FIELD_FULL,
EL_WALL_EMERALD_RED,
EL_SP_PORT_VERTICAL,
EL_SP_PORT_ANY,
EL_SP_DISK_RED,
+#if 0
EL_SP_DISK_YELLOW,
+#endif
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
InitElementPropertiesStatic();
#endif
- /* set all special, combined or engine dependant element properties */
+ /* set all special, combined or engine dependent element properties */
for (i=0; i < MAX_NUM_ELEMENTS; i++)
{
#if 0
/* ---------- 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
engine_version > VERSION_IDENT(2,0,1)));
}
+#if 0
/* dynamically adjust element properties according to game engine version */
#if 0
if (engine_version < RELEASE_IDENT(2,2,0,7))
element_info[element].push_delay_random = 8;
}
}
+#endif
}
static void InitGlobal()
if (access(filename, F_OK) != 0)
Error(ERR_EXIT, "cannot open file '%s'", filename);
- LoadLevelFromFilename(filename);
+ LoadLevelFromFilename(&level, filename);
DumpLevel(&level);
exit(0);
LoadArtworkInfo();
}
+static char *get_string_in_brackets(char *string)
+{
+ char *string_in_brackets = checked_malloc(strlen(string) + 3);
+
+ sprintf(string_in_brackets, "[%s]", string);
+
+ return string_in_brackets;
+}
+
+#if 0
static char *get_element_class_token(int element)
{
char *element_class_name = element_info[element].class_name;
return element_class_token;
}
+static char *get_action_class_token(int action)
+{
+ char *action_class_name = &element_action_info[action].suffix[1];
+ char *action_class_token = checked_malloc(strlen(action_class_name) + 3);
+
+ sprintf(action_class_token, "[%s]", action_class_name);
+
+ return action_class_token;
+}
+#endif
+
static void InitArtworkConfig()
{
static char *image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS + 1];
- static char *sound_id_prefix[MAX_NUM_ELEMENTS + MAX_NUM_ELEMENTS + 1];
+ static char *sound_id_prefix[2 * MAX_NUM_ELEMENTS + 1];
static char *action_id_suffix[NUM_ACTIONS + 1];
static char *direction_id_suffix[NUM_DIRECTIONS + 1];
static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1];
for (i=0; i<MAX_NUM_ELEMENTS; i++)
sound_id_prefix[i] = element_info[i].token_name;
for (i=0; i<MAX_NUM_ELEMENTS; i++)
- sound_id_prefix[MAX_NUM_ELEMENTS + i] = get_element_class_token(i);
- sound_id_prefix[MAX_NUM_ELEMENTS + MAX_NUM_ELEMENTS] = NULL;
+ sound_id_prefix[MAX_NUM_ELEMENTS + i] =
+ get_string_in_brackets(element_info[i].class_name);
+ sound_id_prefix[2 * MAX_NUM_ELEMENTS] = NULL;
for (i=0; i<NUM_ACTIONS; i++)
action_id_suffix[i] = element_action_info[i].suffix;
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
if (leveldir_current_identifier == NULL)
leveldir_current_identifier = leveldir_current->identifier;
+#endif
#if 0
printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier,
/* 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 (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) !=
- getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
+#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));
+#endif
+
+#if 0
+ if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new) == NULL)
+ gfx_new_identifier = GRAPHICS_SUBDIR;
+ else if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) !=
+ getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
gfx_new_identifier = identifier_new;
- if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) !=
- getTreeInfoFromIdentifier(artwork.snd_first, identifier_new))
+#else
+ if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
+ gfx_new_identifier = identifier_new;
+ else
+ gfx_new_identifier = setup.graphics_set;
+#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;
- if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) !=
- getTreeInfoFromIdentifier(artwork.mus_first, 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 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 independant) 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
+ 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,
+ 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",
+ printf("RELOADING GRAPHICS '%s' -> '%s' ['%s']\n",
artwork.gfx_current_identifier,
- artwork.gfx_current->identifier,
- gfx_new_identifier);
+ gfx_new_identifier,
+ artwork.gfx_current->identifier);
+#endif
+
+#if 0
+ artwork.gfx_current =
+ getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier);
+#endif
+#if 0
+ 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
+ printf("DONE RELOADING GFX: '%s' ['%s']\n",
+ artwork.gfx_current_identifier, artwork.gfx_current->identifier);
+#endif
+
redraw_screen = TRUE;
}
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;
FreeTileClipmasks();
CloseVideoDisplay();
- ClosePlatformDependantStuff();
+ ClosePlatformDependentStuff();
exit(exit_value);
}
projects / rocksndiamonds.git / blobdiff