element_info[element].use_gfx_element = FALSE;
element_info[element].gfx_element = EL_EMPTY_SPACE;
- element_info[element].score = 0;
- element_info[element].gem_count = 0;
+ element_info[element].collect_score = 10; /* special default */
+ element_info[element].collect_count = 1; /* special default */
element_info[element].push_delay_fixed = 2; /* special default */
element_info[element].push_delay_random = 8; /* special default */
/* start with no properties at all */
for (j=0; j < NUM_EP_BITFIELDS; j++)
Properties[element][j] = EP_BITMASK_DEFAULT;
+
+ element_info[element].modified_settings = FALSE;
}
BorderElement = EL_STEELWALL;
element_info[element].gfx_element =
checkLevelElement(getFile16BitBE(file));
- element_info[element].score = getFile8Bit(file);
- element_info[element].gem_count = getFile8Bit(file);
+ element_info[element].collect_score = getFile8Bit(file);
+ element_info[element].collect_count = getFile8Bit(file);
element_info[element].push_delay_fixed = getFile16BitBE(file);
element_info[element].push_delay_random = getFile16BitBE(file);
/* some free bytes for future properties and padding */
ReadUnusedBytesFromFile(file, LEVEL_CPART_CUS3_UNUSED);
+
+ /* mark that this custom element has been modified */
+ element_info[element].modified_settings = TRUE;
}
return chunk_size;
static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename)
{
- int x, y;
+ int i, j, x, y;
if (leveldir_current == NULL) /* only when dumping level */
return;
+ /* determine correct game engine version of current level */
if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) ||
IS_LEVELCLASS_USER(leveldir_current))
{
#if 0
- printf("::: This level is private or contributed: '%s'\n", filename);
+ printf("\n::: This level is private or contributed: '%s'\n", filename);
#endif
/* For user contributed and private levels, use the version of
else
{
#if 0
- printf("::: ALWAYS USE LATEST ENGINE FOR THIS LEVEL: [%d] '%s'\n",
+ printf("\n::: ALWAYS USE LATEST ENGINE FOR THIS LEVEL: [%d] '%s'\n",
leveldir_current->sort_priority, filename);
#endif
level->em_slippery_gems = TRUE;
}
- /* map elements which have changed in newer versions */
+ /* map elements that have changed in newer versions */
for(y=0; y<level->fieldy; y++)
{
for(x=0; x<level->fieldx; x++)
element == EL_CHAR(']') ? EL_CHAR_UUMLAUT :
element == EL_CHAR('^') ? EL_CHAR_COPYRIGHT : element);
}
- else if (level->game_version < VERSION_IDENT(3,0,0))
+
+ if (level->game_version < VERSION_IDENT(3,0,0))
{
/* map Supaplex gravity tube elements */
element = (element == EL_SP_GRAVITY_PORT_LEFT ? EL_SP_PORT_LEFT :
}
}
+ /* map custom element change events that have changed in newer versions
+ (these following values have accidentally changed in version 3.0.1) */
+ if (level->game_version <= VERSION_IDENT(3,0,0))
+ {
+ for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+ {
+ int element = EL_CUSTOM_START + i;
+
+ /* order of checking events to be mapped is important */
+ for (j=CE_BY_OTHER; j >= CE_BY_PLAYER; j--)
+ {
+ if (HAS_CHANGE_EVENT(element, j - 2))
+ {
+ SET_CHANGE_EVENT(element, j - 2, FALSE);
+ SET_CHANGE_EVENT(element, j, TRUE);
+ }
+ }
+
+ /* order of checking events to be mapped is important */
+ for (j=CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--)
+ {
+ if (HAS_CHANGE_EVENT(element, j - 1))
+ {
+ SET_CHANGE_EVENT(element, j - 1, FALSE);
+ SET_CHANGE_EVENT(element, j, TRUE);
+ }
+ }
+ }
+ }
+
/* copy elements to runtime playfield array */
for(x=0; x<MAX_LEV_FIELDX; x++)
for(y=0; y<MAX_LEV_FIELDY; y++)
{
int element = EL_CUSTOM_START + i;
- if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
+ if (element_info[element].modified_settings)
{
if (check < num_changed_custom_elements)
{
putFile8Bit(file, element_info[element].use_gfx_element);
putFile16BitBE(file, element_info[element].gfx_element);
- putFile8Bit(file, element_info[element].score);
- putFile8Bit(file, element_info[element].gem_count);
+ putFile8Bit(file, element_info[element].collect_score);
+ putFile8Bit(file, element_info[element].collect_count);
putFile16BitBE(file, element_info[element].push_delay_fixed);
putFile16BitBE(file, element_info[element].push_delay_random);
/* check for non-standard custom elements and calculate "CUS3" chunk size */
for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
- if (Properties[EL_CUSTOM_START +i][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
+ if (element_info[EL_CUSTOM_START + i].modified_settings)
num_changed_custom_elements++;
level_chunk_CUS3_size = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements);
engine_version = getFileVersion(file);
if (engine_version > 0)
tape->engine_version = engine_version;
+ else
+ tape->engine_version = tape->game_version;
}
return chunk_size;
tape.length_seconds = GetTapeLength();
#if 0
- printf("tape version: %d\n", tape.game_version);
+ printf("tape game version: %d\n", tape.game_version);
+ printf("tape engine version: %d\n", tape.engine_version);
#endif
}
{ TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash" },
{ TYPE_SWITCH, &sei.el_chars, "editor.el_chars" },
{ TYPE_SWITCH, &sei.el_custom, "editor.el_custom" },
+ { TYPE_SWITCH, &sei.el_custom_more, "editor.el_custom_more" },
};
static struct TokenInfo shortcut_setup_tokens[] =
si->fullscreen = FALSE;
si->ask_on_escape = TRUE;
- si->graphics_set = getStringCopy(GRAPHICS_SUBDIR);
- si->sounds_set = getStringCopy(SOUNDS_SUBDIR);
- si->music_set = getStringCopy(MUSIC_SUBDIR);
+ si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
+ si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
+ si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR);
si->override_level_graphics = FALSE;
si->override_level_sounds = FALSE;
si->override_level_music = FALSE;
si->editor.el_dx_boulderdash = TRUE;
si->editor.el_chars = TRUE;
si->editor.el_custom = TRUE;
+ si->editor.el_custom_more = FALSE;
si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
projects / rocksndiamonds.git / blobdiff