X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=93ab6bc8e1b564612179ae24109ec3be17b2684c;hb=bafa61706833e7bfe942c388471058749c20c79e;hp=abcf15d20761100b5e14479b9a3acc7985349a7f;hpb=c42862bb754d7a8b1ff476887669650845f7570e;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index abcf15d2..93ab6bc8 100644 --- a/src/files.c +++ b/src/files.c @@ -88,11 +88,12 @@ void setElementChangePages(struct ElementInfo *ei, int change_pages) void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) { - int x, y; + int i, x, y; change->can_change = FALSE; - change->events = CE_BITMASK_DEFAULT; + for (i = 0; i < NUM_CHANGE_EVENTS; i++) + change->has_event[i] = FALSE; change->trigger_player = CH_PLAYER_ANY; change->trigger_side = CH_SIDE_ANY; @@ -171,8 +172,11 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->block_last_field = FALSE; /* EM does not block by default */ level->sp_block_last_field = TRUE; /* SP blocks the last field */ + +#if 0 /* !!! THIS IS NOT A LEVEL SETTING => LOGIC MOVED TO "game.c" !!! */ level->block_delay = 8; /* when blocking, block 8 frames */ level->sp_block_delay = 9; /* SP indeed blocks 9 frames, not 8 */ +#endif level->can_move_into_acid_bits = ~0; /* everything can move into acid */ level->dont_collide_with_bits = ~0; /* always deadly when colliding */ @@ -1087,6 +1091,7 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) for (i = 0; i < num_changed_custom_elements; i++) { int element = getFile16BitBE(file); + unsigned long event_bits; if (!IS_CUSTOM_ELEMENT(element)) { @@ -1125,7 +1130,10 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) element_info[element].content[x][y] = getMappedElement(getFile16BitBE(file)); - element_info[element].change->events = getFile32BitBE(file); + event_bits = getFile32BitBE(file); + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + if (event_bits & (1 << j)) + element_info[element].change->has_event[j] = TRUE; element_info[element].change->target_element = getMappedElement(getFile16BitBE(file)); @@ -1167,7 +1175,7 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) struct ElementInfo *ei; int chunk_size_expected; int element; - int i, x, y; + int i, j, x, y; element = getFile16BitBE(file); @@ -1249,11 +1257,15 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; + unsigned long event_bits; /* always start with reliable default values */ setElementChangeInfoToDefaults(change); - change->events = getFile32BitBE(file); + event_bits = getFile32BitBE(file); + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + if (event_bits & (1 << j)) + change->has_event[j] = TRUE; change->target_element = getMappedElement(getFile16BitBE(file)); @@ -2501,10 +2513,17 @@ void LoadLevelFromFileInfo(struct LevelInfo *level, break; } + /* if level file is invalid, restore level structure to default values */ + if (level->no_valid_file) + setLevelInfoToDefaults(level); + if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN) level->game_engine_type = GAME_ENGINE_TYPE_RND; - CopyNativeLevel_Native_to_RND(level); + if (level_file_info->type == LEVEL_FILE_TYPE_RND) + CopyNativeLevel_RND_to_Native(level); + else + CopyNativeLevel_Native_to_RND(level); } void LoadLevelFromFilename(struct LevelInfo *level, char *filename) @@ -2582,10 +2601,13 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) level->use_spring_bug = TRUE; /* only few elements were able to actively move into acid before 3.1.0 */ + /* trigger settings did not exist before 3.1.0; set to default "any" */ if (level->game_version < VERSION_IDENT(3,1,0,0)) { int i, j; + /* correct "can move into acid" settings (all zero in old levels) */ + level->can_move_into_acid_bits = 0; /* nothing can move into acid */ level->dont_collide_with_bits = 0; /* nothing is deadly when colliding */ @@ -2597,6 +2619,8 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) SET_PROPERTY(EL_CUSTOM_START + i, EP_CAN_MOVE_INTO_ACID, TRUE); + /* correct trigger settings (stored as zero == "none" in old levels) */ + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -2612,6 +2636,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) } } +#if 0 /* !!! MOVED TO "game.c", BECAUSE CAN CHANGE INSIDE LEVEL EDITOR !!! */ #if 1 /* USE_NEW_BLOCK_STYLE */ /* blocking the last field when moving was corrected in version 3.1.1 */ if (level->game_version < VERSION_IDENT(3,1,1,0)) @@ -2628,6 +2653,8 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) level->sp_block_last_field = TRUE; } #endif +#endif + } else /* always use the latest game engine version */ { @@ -2694,7 +2721,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* order of checking and copying events to be mapped is important */ - for (j = CE_OTHER_GETS_COLLECTED; j >= CE_HITTING_SOMETHING; j--) + for (j = CE_PLAYER_COLLECTS_X; j >= CE_HITTING_SOMETHING; j--) { if (HAS_CHANGE_EVENT(element, j - 1)) { @@ -3251,7 +3278,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) { struct ElementInfo *ei = &element_info[element]; - int i, x, y; + int i, j, x, y; putFile16BitBE(file, element); @@ -3313,8 +3340,13 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; + unsigned long event_bits = 0; + + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + if (change->has_event[j]) + event_bits |= (1 << j); - putFile32BitBE(file, change->events); + putFile32BitBE(file, event_bits); putFile16BitBE(file, change->target_element); @@ -3663,7 +3695,7 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) for (i = 0; i < tape->length; i++) { - if (i >= MAX_TAPELEN) + if (i >= MAX_TAPE_LEN) break; for (j = 0; j < MAX_PLAYERS; j++) @@ -3952,7 +3984,7 @@ void SaveTape(int nr) InitTapeDirectory(leveldir_current->subdir); /* if a tape still exists, ask to overwrite it */ - if (access(filename, F_OK) == 0) + if (fileExists(filename)) { new_tape = FALSE; if (!Request("Replace old tape ?", REQ_ASK)) @@ -3998,7 +4030,7 @@ void SaveTape(int nr) tape.changed = FALSE; if (new_tape) - Request("tape saved !", REQ_CONFIRM); + Request("Tape saved !", REQ_CONFIRM); } void DumpTape(struct TapeInfo *tape) @@ -4031,7 +4063,7 @@ void DumpTape(struct TapeInfo *tape) for (i = 0; i < tape->length; i++) { - if (i >= MAX_TAPELEN) + if (i >= MAX_TAPE_LEN) break; printf("%03d: ", i); @@ -4162,17 +4194,18 @@ void SaveScore(int nr) #define SETUP_TOKEN_QUICK_DOORS 10 #define SETUP_TOKEN_TEAM_MODE 11 #define SETUP_TOKEN_HANDICAP 12 -#define SETUP_TOKEN_TIME_LIMIT 13 -#define SETUP_TOKEN_FULLSCREEN 14 -#define SETUP_TOKEN_ASK_ON_ESCAPE 15 -#define SETUP_TOKEN_GRAPHICS_SET 16 -#define SETUP_TOKEN_SOUNDS_SET 17 -#define SETUP_TOKEN_MUSIC_SET 18 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 19 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 20 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 21 - -#define NUM_GLOBAL_SETUP_TOKENS 22 +#define SETUP_TOKEN_SKIP_LEVELS 13 +#define SETUP_TOKEN_TIME_LIMIT 14 +#define SETUP_TOKEN_FULLSCREEN 15 +#define SETUP_TOKEN_ASK_ON_ESCAPE 16 +#define SETUP_TOKEN_GRAPHICS_SET 17 +#define SETUP_TOKEN_SOUNDS_SET 18 +#define SETUP_TOKEN_MUSIC_SET 19 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 20 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 21 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 22 + +#define NUM_GLOBAL_SETUP_TOKENS 23 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -4252,6 +4285,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.quick_doors, "quick_doors" }, { TYPE_SWITCH, &si.team_mode, "team_mode" }, { TYPE_SWITCH, &si.handicap, "handicap" }, + { TYPE_SWITCH, &si.skip_levels, "skip_levels" }, { TYPE_SWITCH, &si.time_limit, "time_limit" }, { TYPE_SWITCH, &si.fullscreen, "fullscreen" }, { TYPE_SWITCH, &si.ask_on_escape, "ask_on_escape" }, @@ -4353,6 +4387,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->quick_doors = FALSE; si->team_mode = FALSE; si->handicap = TRUE; + si->skip_levels = TRUE; si->time_limit = TRUE; si->fullscreen = FALSE; si->ask_on_escape = TRUE; @@ -4681,7 +4716,19 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) { char *value = getHashEntry(element_hash, list->token); - if (value) + if (value == NULL) /* try to find obsolete token mapping */ + { + char *mapped_token = get_mapped_token(list->token); + + if (mapped_token != NULL) + { + value = getHashEntry(element_hash, mapped_token); + + free(mapped_token); + } + } + + if (value != NULL) { (*elements)[(*num_elements)++] = atoi(value); }