X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=ae43afc879aae27806d27a55d4a4b34bc530df21;hb=9c285b0e8e4d81c5559815c5f7142685ce865206;hp=8233ac5141d754d86f69495d33444cac798ee880;hpb=4bb90da7a98b741b4576099be6b89d324c8a80de;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 8233ac51..ae43afc8 100644 --- a/src/files.c +++ b/src/files.c @@ -47,6 +47,17 @@ #define TAPE_COOKIE_TMPL "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x" #define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" +/* values for level file type identifier */ +#define LEVEL_FILE_TYPE_UNKNOWN 0 +#define LEVEL_FILE_TYPE_RND 1 +#define LEVEL_FILE_TYPE_EM 2 + +#define LEVEL_FILE_TYPE_RND_PACKED (10 + LEVEL_FILE_TYPE_RND) +#define LEVEL_FILE_TYPE_EM_PACKED (10 + LEVEL_FILE_TYPE_EM) + +#define IS_SINGLE_LEVEL_FILE(x) (x < 10) +#define IS_PACKED_LEVEL_FILE(x) (x > 10) + /* ========================================================================= */ /* level file functions */ @@ -268,13 +279,109 @@ static void ActivateLevelTemplate() level data, while all other variables do not change. */ } -boolean LevelFileExists(int level_nr) +static char *getLevelFilenameFromBasename(char *basename) +{ + static char *filename = NULL; + + checked_free(filename); + + filename = getPath2(getCurrentLevelDir(), basename); + + return filename; +} + +static char *getSingleLevelBasename(int nr, int type) +{ + static char basename[MAX_FILENAME_LEN]; + + switch (type) + { + case LEVEL_FILE_TYPE_RND: + if (nr < 0) + sprintf(basename, "template.%s", LEVELFILE_EXTENSION); + else + sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); + break; + + case LEVEL_FILE_TYPE_EM: + sprintf(basename, "%d", nr); + break; + + default: + strcpy(basename, UNDEFINED_FILENAME); + break; + } + + return basename; +} + +static char *getPackedLevelBasename(int type) +{ + static char basename[MAX_FILENAME_LEN]; + + switch (type) + { + default: + strcpy(basename, UNDEFINED_FILENAME); + break; + } + + return basename; +} + +static char *getSingleLevelFilename(int nr, int type) { - char *filename = getLevelFilename(level_nr); + return getLevelFilenameFromBasename(getSingleLevelBasename(nr, type)); +} + +static char *getPackedLevelFilename(int type) +{ + return getLevelFilenameFromBasename(getPackedLevelBasename(type)); +} - return (access(filename, F_OK) == 0); +char *getDefaultLevelFilename(int nr) +{ + return getSingleLevelFilename(nr, LEVEL_FILE_TYPE_RND); } +static struct LevelFileInfo *getLevelFileInfo(int nr) +{ + static struct LevelFileInfo level_file_info; + + level_file_info.nr = nr; + + /* special case: level template */ + if (nr < 0) + { + level_file_info.type = LEVEL_FILE_TYPE_RND; + level_file_info.filename = getDefaultLevelFilename(nr); + + return &level_file_info; + } + + /* 1st try: check for native Rocks'n'Diamonds level file */ + level_file_info.type = LEVEL_FILE_TYPE_RND; + level_file_info.filename = getSingleLevelFilename(nr, level_file_info.type); + if (fileExists(level_file_info.filename)) + return &level_file_info; + + /* 2nd try: check for classic Emerald Mine level file */ + level_file_info.type = LEVEL_FILE_TYPE_EM; + level_file_info.filename = getSingleLevelFilename(nr, level_file_info.type); + if (fileExists(level_file_info.filename)) + return &level_file_info; + + /* no known level file found -- use default values */ + level_file_info.type = LEVEL_FILE_TYPE_RND; + level_file_info.filename = getSingleLevelFilename(nr, level_file_info.type); + + return &level_file_info; +} + +/* ------------------------------------------------------------------------- */ +/* functions for loading R'n'D level */ +/* ------------------------------------------------------------------------- */ + static int checkLevelElement(int element) { /* map some (historic, now obsolete) elements */ @@ -797,8 +904,10 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -void LoadLevelFromFilename(struct LevelInfo *level, char *filename) +static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, + struct LevelFileInfo *level_file_info) { + char *filename = level_file_info->filename; char cookie[MAX_LINE_LEN]; char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; @@ -812,7 +921,7 @@ void LoadLevelFromFilename(struct LevelInfo *level, char *filename) level->no_level_file = TRUE; if (level != &level_template) - Error(ERR_WARN, "cannot read level '%s' - creating new level", filename); + Error(ERR_WARN, "cannot read level '%s' - using empty level", filename); return; } @@ -927,6 +1036,338 @@ void LoadLevelFromFilename(struct LevelInfo *level, char *filename) fclose(file); } +/* ------------------------------------------------------------------------- */ +/* functions for loading EM level */ +/* ------------------------------------------------------------------------- */ + +static int map_em_element_yam(int element) +{ + switch (element) + { + case 0x00: return EL_EMPTY; + case 0x01: return EL_EMERALD; + case 0x02: return EL_DIAMOND; + case 0x03: return EL_ROCK; + case 0x04: return EL_ROBOT; + case 0x05: return EL_SPACESHIP_UP; + case 0x06: return EL_BOMB; + case 0x07: return EL_BUG_UP; + case 0x08: return EL_AMOEBA_DROP; + case 0x09: return EL_NUT; + case 0x0a: return EL_YAMYAM; + case 0x0b: return EL_QUICKSAND_FULL; + case 0x0c: return EL_SAND; + case 0x0d: return EL_WALL_SLIPPERY; + case 0x0e: return EL_STEELWALL; + case 0x0f: return EL_WALL; + case 0x10: return EL_EM_KEY_1; + case 0x11: return EL_EM_KEY_2; + case 0x12: return EL_EM_KEY_4; + case 0x13: return EL_EM_KEY_3; + case 0x14: return EL_MAGIC_WALL; + case 0x15: return EL_ROBOT_WHEEL; + case 0x16: return EL_DYNAMITE; + + case 0x17: return EL_EM_KEY_1; /* EMC */ + case 0x18: return EL_BUG_UP; /* EMC */ + case 0x1a: return EL_DIAMOND; /* EMC */ + case 0x1b: return EL_EMERALD; /* EMC */ + case 0x25: return EL_NUT; /* EMC */ + case 0x80: return EL_EMPTY; /* EMC */ + case 0x85: return EL_EM_KEY_1; /* EMC */ + case 0x86: return EL_EM_KEY_2; /* EMC */ + case 0x87: return EL_EM_KEY_4; /* EMC */ + case 0x88: return EL_EM_KEY_3; /* EMC */ + case 0x94: return EL_QUICKSAND_EMPTY; /* EMC */ + case 0x9a: return EL_AMOEBA_WET; /* EMC */ + case 0xaf: return EL_DYNAMITE; /* EMC */ + case 0xbd: return EL_SAND; /* EMC */ + + default: + Error(ERR_WARN, "invalid level element %d", element); + return EL_CHAR_QUESTION; + } +} + +static int map_em_element_field(int element) +{ + if (element >= 0xc8 && element <= 0xe1) + return EL_CHAR_A + (element - 0xc8); + else if (element >= 0xe2 && element <= 0xeb) + return EL_CHAR_0 + (element - 0xe2); + + switch (element) + { + case 0x00: return EL_ROCK; + case 0x02: return EL_DIAMOND; + case 0x03: return EL_DIAMOND; + case 0x04: return EL_ROBOT; + case 0x05: return EL_ROBOT; /* EMC */ + case 0x08: return EL_SPACESHIP_UP; + case 0x09: return EL_SPACESHIP_RIGHT; + case 0x0a: return EL_SPACESHIP_DOWN; + case 0x0b: return EL_SPACESHIP_LEFT; + case 0x0c: return EL_SPACESHIP_UP; + case 0x0d: return EL_SPACESHIP_RIGHT; + case 0x0e: return EL_SPACESHIP_DOWN; + case 0x0f: return EL_SPACESHIP_LEFT; + case 0x10: return EL_BOMB; + case 0x12: return EL_EMERALD; + case 0x13: return EL_EMERALD; + case 0x14: return EL_BUG_UP; + case 0x15: return EL_BUG_RIGHT; + case 0x16: return EL_BUG_DOWN; + case 0x17: return EL_BUG_LEFT; + case 0x18: return EL_BUG_UP; + case 0x19: return EL_BUG_RIGHT; + case 0x1a: return EL_BUG_DOWN; + case 0x1b: return EL_BUG_LEFT; + case 0x1c: return EL_AMOEBA_DROP; + case 0x20: return EL_ROCK; + case 0x24: return EL_MAGIC_WALL; + case 0x25: return EL_NUT; + + /* looks like magic wheel, but is _always_ activated */ + case 0x28: return EL_ROBOT_WHEEL; /* EMC */ + + case 0x29: return EL_YAMYAM; + case 0x2a: return EL_YAMYAM; + case 0x2b: return EL_YAMYAM; /* EMC */ + case 0x2c: return EL_YAMYAM; /* EMC */ + case 0x2d: return EL_QUICKSAND_FULL; + case 0x39: return EL_EXPANDABLE_WALL_HORIZONTAL; /* EMC */ + case 0x3a: return EL_EXPANDABLE_WALL_VERTICAL; /* EMC */ + case 0x3b: return EL_DYNAMITE_ACTIVE; + case 0x3c: return EL_DYNAMITE_ACTIVE; + case 0x3d: return EL_DYNAMITE_ACTIVE; + case 0x3e: return EL_DYNAMITE_ACTIVE; + case 0x3f: return EL_ACID_POOL_BOTTOM; + case 0x40: return EL_EXIT_OPEN; + case 0x41: return EL_EXIT_OPEN; + case 0x42: return EL_EXIT_OPEN; + case 0x43: return EL_BALLOON; + case 0x4e: return EL_INVISIBLE_WALL; + case 0x65: return EL_ACID; /* EMC */ + case 0x73: return EL_SAND; /* EMC */ + case 0x74: return EL_STEELWALL; + case 0x7b: return EL_ACID; + case 0x80: return EL_EMPTY; + case 0x81: return EL_WALL_SLIPPERY; + case 0x82: return EL_SAND; + case 0x83: return EL_STEELWALL; + case 0x84: return EL_WALL; + case 0x85: return EL_EM_KEY_1; + case 0x86: return EL_EM_KEY_2; + case 0x87: return EL_EM_KEY_4; + case 0x88: return EL_EM_KEY_3; + case 0x89: return EL_EM_GATE_1; + case 0x8a: return EL_EM_GATE_2; + case 0x8b: return EL_EM_GATE_4; + case 0x8c: return EL_EM_GATE_3; + case 0x8d: return EL_INVISIBLE_WALL; /* EMC */ + case 0x8e: return EL_EM_GATE_1_GRAY; + case 0x8f: return EL_EM_GATE_2_GRAY; + case 0x90: return EL_EM_GATE_4_GRAY; + case 0x91: return EL_EM_GATE_3_GRAY; + case 0x92: return EL_MAGIC_WALL; + case 0x94: return EL_QUICKSAND_EMPTY; + case 0x95: return EL_ACID_POOL_TOPLEFT; + case 0x96: return EL_ACID_POOL_TOPRIGHT; + case 0x97: return EL_ACID_POOL_BOTTOMLEFT; + case 0x98: return EL_ACID_POOL_BOTTOMRIGHT; + case 0x99: return EL_ACID; + case 0x9a: return EL_AMOEBA_DEAD; + case 0x9b: return EL_AMOEBA_DEAD; + case 0x9c: return EL_AMOEBA_DEAD; + case 0x9d: return EL_AMOEBA_DEAD; + case 0x9e: return EL_EXIT_CLOSED; + case 0x9f: return EL_CHAR_LESS; /* EMC */ + case 0x93: return EL_ROBOT_WHEEL; + + /* looks like normal dust, but behaves like wall */ + case 0xa0: return EL_WALL; /* EMC */ + + case 0xa8: return EL_EMC_WALL_1; /* EMC */ + case 0xa9: return EL_EMC_WALL_2; /* EMC */ + case 0xaa: return EL_EMC_WALL_3; /* EMC */ + case 0xab: return EL_EMC_WALL_7; /* EMC */ + case 0xae: return EL_CHAR_MINUS; /* EMC */ + case 0xaf: return EL_DYNAMITE; + case 0xb0: return EL_EMC_STEELWALL_1; /* EMC */ + case 0xb1: return EL_EMC_WALL_8; /* EMC */ + + /* (exact steel wall) */ + case 0xb3: return EL_STEELWALL; /* EMC */ + + case 0xb4: return EL_WALL_SLIPPERY; /* EMC */ + case 0xb5: return EL_EMC_WALL_6; /* EMC */ + case 0xb6: return EL_EMC_WALL_5; /* EMC */ + case 0xb7: return EL_EMC_WALL_4; /* EMC */ + case 0xb8: return EL_BALLOON_SWITCH_ANY; /* EMC */ + case 0xb9: return EL_BALLOON_SWITCH_RIGHT; /* EMC */ + case 0xba: return EL_BALLOON_SWITCH_DOWN; /* EMC */ + case 0xbb: return EL_BALLOON_SWITCH_LEFT; /* EMC */ + case 0xbc: return EL_BALLOON_SWITCH_UP; /* EMC */ + case 0xbd: return EL_SAND; /* EMC */ + case 0xec: return EL_CHAR_PERIOD; + case 0xed: return EL_CHAR_EXCLAM; + case 0xee: return EL_CHAR_COLON; + case 0xef: return EL_CHAR_QUESTION; + case 0xf0: return EL_CHAR_GREATER; + case 0xf1: return EL_CHAR_COPYRIGHT; + case 0xfe: return EL_PLAYER_1; + case 0xff: return EL_PLAYER_2; + + default: + Error(ERR_WARN, "invalid level element %d", element); + return EL_CHAR_QUESTION; + } +} + +static void LoadLevelFromFileInfo_EM(struct LevelInfo *level, + struct LevelFileInfo *level_file_info) +{ + char *filename = level_file_info->filename; + FILE *file; + unsigned char body[40][64]; + unsigned char *leveldata = &body[0][0]; + unsigned char *header = &leveldata[2048]; + unsigned char code0 = 0x65; + unsigned char code1 = 0x11; + boolean level_is_crypted = FALSE; + int nr = level_file_info->nr; + int jx, jy; + int i, x, y; + + /* always start with reliable default values */ + setLevelInfoToDefaults(level); + + if (!(file = fopen(filename, MODE_READ))) + { + level->no_level_file = TRUE; + + Error(ERR_WARN, "cannot read level '%s' - using empty level", filename); + + return; + } + + for(i = 0; i < 2106; i++) + leveldata[i] = fgetc(file); + + fclose(file); + + /* check if level data is crypted by testing against known starting bytes + of the few existing crypted level files (from Emerald Mine 1 + 2) */ + + if ((leveldata[0] == 0xf1 || + leveldata[0] == 0xf5) && leveldata[2] == 0xe7 && leveldata[3] == 0xee) + { + level_is_crypted = TRUE; + + if (leveldata[0] == 0xf5) /* error in crypted Emerald Mine 2 levels */ + leveldata[0] = 0xf1; + } + + if (level_is_crypted) /* decode crypted level data */ + { + for(i = 0; i < 2106; i++) + { + leveldata[i] ^= code0; + leveldata[i] -= code1; + + code0 = (code0 + 7) & 0xff; + } + } + + level->fieldx = 64; + level->fieldy = 32; + + level->time = header[46] * 10; + level->gems_needed = header[47]; + + /* The original Emerald Mine levels have their level number stored + at the second byte of the level file... + Do not trust this information at other level files, e.g. EMC, + but correct it anyway (normally the first row is completely + steel wall, so the correction does not hurt anyway). */ + + if (leveldata[1] == nr) + leveldata[1] = leveldata[2]; /* correct level number field */ + + sprintf(level->name, "Level %d", nr); + + level->score[SC_EMERALD] = header[36]; + level->score[SC_DIAMOND] = header[37]; + level->score[SC_ROBOT] = header[38]; + level->score[SC_SPACESHIP] = header[39]; + level->score[SC_BUG] = header[40]; + level->score[SC_YAMYAM] = header[41]; + level->score[SC_NUT] = header[42]; + level->score[SC_DYNAMITE] = header[43]; + level->score[SC_TIME_BONUS] = header[44]; + + level->num_yamyam_contents = 4; + + for(i = 0; i < level->num_yamyam_contents; i++) + for(y = 0; y < 3; y++) + for(x = 0; x < 3; x++) + level->yamyam_content[i][x][y] = + map_em_element_yam(header[i * 9 + y * 3 + x]); + + level->amoeba_speed = (header[52] * 256 + header[53]) % 256; + level->time_magic_wall = (header[54] * 256 + header[55]) * 16 / 100; + level->time_wheel = (header[56] * 256 + header[57]) * 16 / 100; + level->amoeba_content = EL_DIAMOND; + + for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) + { + int new_element = map_em_element_field(body[y][x]); + + if (new_element == EL_AMOEBA_DEAD && level->amoeba_speed) + new_element = EL_AMOEBA_WET; + + level->field[x][y] = new_element; + } + + jx = (header[48] * 256 + header[49]) % 64; + jy = (header[48] * 256 + header[49]) / 64; + level->field[jx][jy] = EL_PLAYER_1; + + jx = (header[50] * 256 + header[51]) % 64; + jy = (header[50] * 256 + header[51]) / 64; + level->field[jx][jy] = EL_PLAYER_2; +} + +void LoadLevelFromFileInfo(struct LevelInfo *level, + struct LevelFileInfo *level_file_info) +{ + switch (level_file_info->type) + { + case LEVEL_FILE_TYPE_RND: + LoadLevelFromFileInfo_RND(level, level_file_info); + break; + + case LEVEL_FILE_TYPE_EM: + LoadLevelFromFileInfo_EM(level, level_file_info); + break; + + default: + LoadLevelFromFileInfo_RND(level, level_file_info); + break; + } +} + +void LoadLevelFromFilename(struct LevelInfo *level, char *filename) +{ + static struct LevelFileInfo level_file_info; + + level_file_info.nr = 0; /* unknown */ + level_file_info.type = LEVEL_FILE_TYPE_RND; /* no others supported yet */ + level_file_info.filename = filename; + + LoadLevelFromFileInfo(level, &level_file_info); +} + static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) { if (leveldir_current == NULL) /* only when dumping level */ @@ -1032,7 +1473,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) int element = EL_CUSTOM_START + i; /* order of checking and copying events to be mapped is important */ - for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER; j--) + for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER_OBSOLETE; j--) { if (HAS_CHANGE_EVENT(element, j - 2)) { @@ -1042,7 +1483,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_COLLISION; j--) + for (j = CE_OTHER_GETS_COLLECTED; j >= CE_HITTING_SOMETHING; j--) { if (HAS_CHANGE_EVENT(element, j - 1)) { @@ -1058,11 +1499,11 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) { int element = EL_CUSTOM_START + i; - if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER) || - HAS_CHANGE_EVENT(element, CE_BY_COLLISION)) + if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE) || + HAS_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE)) { - SET_CHANGE_EVENT(element, CE_BY_PLAYER, FALSE); - SET_CHANGE_EVENT(element, CE_BY_COLLISION, FALSE); + SET_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE, FALSE); + SET_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE, FALSE); SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE); } @@ -1156,11 +1597,18 @@ static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename) SetBorderElement(); } -void LoadLevelTemplate(int level_nr) +void LoadLevelTemplate(int nr) { - char *filename = getLevelFilename(level_nr); +#if 1 + struct LevelFileInfo *level_file_info = getLevelFileInfo(nr); + char *filename = level_file_info->filename; + + LoadLevelFromFileInfo(&level, level_file_info); +#else + char *filename = getDefaultLevelFilename(nr); - LoadLevelFromFilename(&level_template, filename); + LoadLevelFromFilename_RND(&level_template, filename); +#endif LoadLevel_InitVersion(&level, filename); LoadLevel_InitElements(&level, filename); @@ -1168,11 +1616,18 @@ void LoadLevelTemplate(int level_nr) ActivateLevelTemplate(); } -void LoadLevel(int level_nr) +void LoadLevel(int nr) { - char *filename = getLevelFilename(level_nr); +#if 1 + struct LevelFileInfo *level_file_info = getLevelFileInfo(nr); + char *filename = level_file_info->filename; + + LoadLevelFromFileInfo(&level, level_file_info); +#else + char *filename = getLevelFilename(nr); - LoadLevelFromFilename(&level, filename); + LoadLevelFromFilename_RND(&level, filename); +#endif if (level.use_custom_template) LoadLevelTemplate(-1); @@ -1658,16 +2113,16 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) SetFilePermissions(filename, PERMS_PRIVATE); } -void SaveLevel(int level_nr) +void SaveLevel(int nr) { - char *filename = getLevelFilename(level_nr); + char *filename = getDefaultLevelFilename(nr); SaveLevelFromFilename(&level, filename); } void SaveLevelTemplate() { - char *filename = getLevelFilename(-1); + char *filename = getDefaultLevelFilename(-1); SaveLevelFromFilename(&level, filename); } @@ -2004,9 +2459,16 @@ void LoadTapeFromFilename(char *filename) #endif } -void LoadTape(int level_nr) +void LoadTape(int nr) +{ + char *filename = getTapeFilename(nr); + + LoadTapeFromFilename(filename); +} + +void LoadSolutionTape(int nr) { - char *filename = getTapeFilename(level_nr); + char *filename = getSolutionTapeFilename(nr); LoadTapeFromFilename(filename); } @@ -2066,9 +2528,9 @@ static void SaveTape_BODY(FILE *file, struct TapeInfo *tape) } } -void SaveTape(int level_nr) +void SaveTape(int nr) { - char *filename = getTapeFilename(level_nr); + char *filename = getTapeFilename(nr); FILE *file; boolean new_tape = TRUE; int num_participating_players = 0; @@ -2179,10 +2641,10 @@ void DumpTape(struct TapeInfo *tape) /* score file functions */ /* ========================================================================= */ -void LoadScore(int level_nr) +void LoadScore(int nr) { int i; - char *filename = getScoreFilename(level_nr); + char *filename = getScoreFilename(nr); char cookie[MAX_LINE_LEN]; char line[MAX_LINE_LEN]; char *line_ptr; @@ -2232,17 +2694,17 @@ void LoadScore(int level_nr) fclose(file); } -void SaveScore(int level_nr) +void SaveScore(int nr) { int i; - char *filename = getScoreFilename(level_nr); + char *filename = getScoreFilename(nr); FILE *file; InitScoreDirectory(leveldir_current->filename); if (!(file = fopen(filename, MODE_WRITE))) { - Error(ERR_WARN, "cannot save score for level %d", level_nr); + Error(ERR_WARN, "cannot save score for level %d", nr); return; } @@ -2322,13 +2784,13 @@ void SaveScore(int level_nr) #define SETUP_TOKEN_PLAYER_JOY_YMIDDLE 6 #define SETUP_TOKEN_PLAYER_JOY_YLOWER 7 #define SETUP_TOKEN_PLAYER_JOY_SNAP 8 -#define SETUP_TOKEN_PLAYER_JOY_BOMB 9 +#define SETUP_TOKEN_PLAYER_JOY_DROP 9 #define SETUP_TOKEN_PLAYER_KEY_LEFT 10 #define SETUP_TOKEN_PLAYER_KEY_RIGHT 11 #define SETUP_TOKEN_PLAYER_KEY_UP 12 #define SETUP_TOKEN_PLAYER_KEY_DOWN 13 #define SETUP_TOKEN_PLAYER_KEY_SNAP 14 -#define SETUP_TOKEN_PLAYER_KEY_BOMB 15 +#define SETUP_TOKEN_PLAYER_KEY_DROP 15 #define NUM_PLAYER_SETUP_TOKENS 16 @@ -2411,13 +2873,13 @@ static struct TokenInfo player_setup_tokens[] = { TYPE_INTEGER, &sii.joy.ymiddle, ".joy.ymiddle" }, { TYPE_INTEGER, &sii.joy.ylower, ".joy.ylower" }, { TYPE_INTEGER, &sii.joy.snap, ".joy.snap_field" }, - { TYPE_INTEGER, &sii.joy.bomb, ".joy.place_bomb" }, + { TYPE_INTEGER, &sii.joy.drop, ".joy.place_bomb" }, { TYPE_KEY_X11, &sii.key.left, ".key.move_left" }, { TYPE_KEY_X11, &sii.key.right, ".key.move_right" }, { TYPE_KEY_X11, &sii.key.up, ".key.move_up" }, { TYPE_KEY_X11, &sii.key.down, ".key.move_down" }, { TYPE_KEY_X11, &sii.key.snap, ".key.snap_field" }, - { TYPE_KEY_X11, &sii.key.bomb, ".key.place_bomb" } + { TYPE_KEY_X11, &sii.key.drop, ".key.place_bomb" } }; static struct TokenInfo system_setup_tokens[] = @@ -2506,13 +2968,13 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->input[i].joy.ymiddle = JOYSTICK_YMIDDLE; si->input[i].joy.ylower = JOYSTICK_YLOWER; si->input[i].joy.snap = (i == 0 ? JOY_BUTTON_1 : 0); - si->input[i].joy.bomb = (i == 0 ? JOY_BUTTON_2 : 0); + si->input[i].joy.drop = (i == 0 ? JOY_BUTTON_2 : 0); si->input[i].key.left = (i == 0 ? DEFAULT_KEY_LEFT : KSYM_UNDEFINED); si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KSYM_UNDEFINED); si->input[i].key.up = (i == 0 ? DEFAULT_KEY_UP : KSYM_UNDEFINED); si->input[i].key.down = (i == 0 ? DEFAULT_KEY_DOWN : KSYM_UNDEFINED); si->input[i].key.snap = (i == 0 ? DEFAULT_KEY_SNAP : KSYM_UNDEFINED); - si->input[i].key.bomb = (i == 0 ? DEFAULT_KEY_BOMB : KSYM_UNDEFINED); + si->input[i].key.drop = (i == 0 ? DEFAULT_KEY_DROP : KSYM_UNDEFINED); } si->system.sdl_audiodriver = getStringCopy(ARG_DEFAULT); @@ -2829,12 +3291,12 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) #endif } -static struct MusicFileInfo *get_music_file_info(char *basename, int music) +static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, + boolean is_sound) { SetupFileHash *setup_file_hash = NULL; struct MusicFileInfo tmp_music_file_info, *new_music_file_info; - char *filename_music = getCustomMusicFilename(basename); - char *filename_prefix, *filename_info; + char *filename_music, *filename_prefix, *filename_info; struct { char *token; @@ -2842,15 +3304,23 @@ static struct MusicFileInfo *get_music_file_info(char *basename, int music) } token_to_value_ptr[] = { - { "context", &tmp_music_file_info.context }, - { "title", &tmp_music_file_info.title }, - { "artist", &tmp_music_file_info.artist }, - { "album", &tmp_music_file_info.album }, - { "year", &tmp_music_file_info.year }, - { NULL, NULL }, + { "title_header", &tmp_music_file_info.title_header }, + { "artist_header", &tmp_music_file_info.artist_header }, + { "album_header", &tmp_music_file_info.album_header }, + { "year_header", &tmp_music_file_info.year_header }, + + { "title", &tmp_music_file_info.title }, + { "artist", &tmp_music_file_info.artist }, + { "album", &tmp_music_file_info.album }, + { "year", &tmp_music_file_info.year }, + + { NULL, NULL }, }; int i; + filename_music = (is_sound ? getCustomSoundFilename(basename) : + getCustomMusicFilename(basename)); + if (filename_music == NULL) return NULL; @@ -2901,10 +3371,12 @@ static struct MusicFileInfo *get_music_file_info(char *basename, int music) char *value = getHashEntry(setup_file_hash, token_to_value_ptr[i].token); *token_to_value_ptr[i].value_ptr = - getStringCopy(value != NULL ? value : UNKNOWN_NAME); + getStringCopy(value != NULL && *value != '\0' ? value : UNKNOWN_NAME); } + tmp_music_file_info.basename = getStringCopy(basename); tmp_music_file_info.music = music; + tmp_music_file_info.is_sound = is_sound; new_music_file_info = checked_malloc(sizeof(struct MusicFileInfo)); *new_music_file_info = tmp_music_file_info; @@ -2912,14 +3384,45 @@ static struct MusicFileInfo *get_music_file_info(char *basename, int music) return new_music_file_info; } +static struct MusicFileInfo *get_music_file_info(char *basename, int music) +{ + return get_music_file_info_ext(basename, music, FALSE); +} + +static struct MusicFileInfo *get_sound_file_info(char *basename, int sound) +{ + return get_music_file_info_ext(basename, sound, TRUE); +} + +static boolean music_info_listed_ext(struct MusicFileInfo *list, + char *basename, boolean is_sound) +{ + for (; list != NULL; list = list->next) + if (list->is_sound == is_sound && strcmp(list->basename, basename) == 0) + return TRUE; + + return FALSE; +} + +static boolean music_info_listed(struct MusicFileInfo *list, char *basename) +{ + return music_info_listed_ext(list, basename, FALSE); +} + +static boolean sound_info_listed(struct MusicFileInfo *list, char *basename) +{ + return music_info_listed_ext(list, basename, TRUE); +} + void LoadMusicInfo() { char *music_directory = getCustomMusicDirectory(); int num_music = getMusicListSize(); int num_music_noconf = 0; + int num_sounds = getSoundListSize(); DIR *dir; struct dirent *dir_entry; - struct FileInfo *music; + struct FileInfo *music, *sound; struct MusicFileInfo *next, **new; int i; @@ -2927,16 +3430,17 @@ void LoadMusicInfo() { next = music_file_info->next; - if (music_file_info->context) - free(music_file_info->context); - if (music_file_info->title) - free(music_file_info->title); - if (music_file_info->artist) - free(music_file_info->artist); - if (music_file_info->album) - free(music_file_info->album); - if (music_file_info->year) - free(music_file_info->year); + checked_free(music_file_info->basename); + + checked_free(music_file_info->title_header); + checked_free(music_file_info->artist_header); + checked_free(music_file_info->album_header); + checked_free(music_file_info->year_header); + + checked_free(music_file_info->title); + checked_free(music_file_info->artist); + checked_free(music_file_info->album); + checked_free(music_file_info->year); free(music_file_info); @@ -2945,10 +3449,21 @@ void LoadMusicInfo() new = &music_file_info; +#if 0 + printf("::: num_music == %d\n", num_music); +#endif + for (i = 0; i < num_music; i++) { music = getMusicListEntry(i); +#if 0 + printf("::: %d [%08x]\n", i, music->filename); +#endif + + if (music->filename == NULL) + continue; + if (strcmp(music->filename, UNDEFINED_FILENAME) == 0) continue; @@ -2960,9 +3475,12 @@ void LoadMusicInfo() printf("::: -> '%s' (configured)\n", music->filename); #endif - *new = get_music_file_info(music->filename, i); - if (*new != NULL) - new = &(*new)->next; + if (!music_info_listed(music_file_info, music->filename)) + { + *new = get_music_file_info(music->filename, i); + if (*new != NULL) + new = &(*new)->next; + } } if ((dir = opendir(music_directory)) == NULL) @@ -2977,10 +3495,14 @@ void LoadMusicInfo() boolean music_already_used = FALSE; int i; + /* skip all music files that are configured in music config file */ for (i = 0; i < num_music; i++) { music = getMusicListEntry(i); + if (music->filename == NULL) + continue; + if (strcmp(basename, music->filename) == 0) { music_already_used = TRUE; @@ -2998,15 +3520,44 @@ void LoadMusicInfo() printf("::: -> '%s' (found in directory)\n", basename); #endif - *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf)); - if (*new != NULL) - new = &(*new)->next; + if (!music_info_listed(music_file_info, basename)) + { + *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf)); + if (*new != NULL) + new = &(*new)->next; + } num_music_noconf++; } closedir(dir); + for (i = 0; i < num_sounds; i++) + { + sound = getSoundListEntry(i); + + if (sound->filename == NULL) + continue; + + if (strcmp(sound->filename, UNDEFINED_FILENAME) == 0) + continue; + + /* a configured file may be not recognized as sound */ + if (!FileIsSound(sound->filename)) + continue; + +#if 0 + printf("::: -> '%s' (configured)\n", sound->filename); +#endif + + if (!sound_info_listed(music_file_info, sound->filename)) + { + *new = get_sound_file_info(sound->filename, i); + if (*new != NULL) + new = &(*new)->next; + } + } + #if 0 /* TEST-ONLY */ for (next = music_file_info; next != NULL; next = next->next)