X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=bdd8b54319ae9c94b82876953d10d7a9760f01d9;hb=21c25c56356db2138816a0716d73934ac3893e89;hp=21ed3ca17f8614be3770784740da65e1be5baf7c;hpb=2357c391b4a587709627cc30316734b3c83c8134;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 21ed3ca1..bdd8b543 100644 --- a/src/files.c +++ b/src/files.c @@ -19,6 +19,62 @@ #include "tape.h" #include "joystick.h" +static char *getUserdataDir() +{ + static char *userdata_dir = NULL; + + if (!userdata_dir) + { + char *home_dir = getHomeDir(); + char *data_dir = USERDATA_DIRECTORY; + + userdata_dir = checked_malloc(strlen(home_dir) + strlen(data_dir) + 2); + sprintf(userdata_dir, "%s/%s", home_dir, data_dir); + } + + return userdata_dir; +} + +static char *getSetupDir() +{ + return getUserdataDir(); +} + +static char *getTapeDir(char *level_subdir) +{ + static char *tape_dir = NULL; + char *data_dir = getUserdataDir(); + char *tape_subdir = TAPEDATA_DIRECTORY; + + if (tape_dir) + free(tape_dir); + + tape_dir = checked_malloc(strlen(data_dir) + strlen(tape_subdir) + + strlen(level_subdir) + 3); + sprintf(tape_dir, "%s/%s%s%s", data_dir, tape_subdir, + (strlen(level_subdir) > 0 ? "/" : ""), level_subdir); + + return tape_dir; +} + +static void createDirectory(char *dir, char *text) +{ + if (access(dir, F_OK) != 0) + if (mkdir(dir, USERDATA_DIR_MODE) != 0) + Error(ERR_WARN, "cannot create %s directory '%s'", text, dir); +} + +void InitUserdataDirectory() +{ + createDirectory(getUserdataDir(), "user data"); +} + +static void InitTapeDirectory(char *level_subdir) +{ + createDirectory(getTapeDir(""), "main tape data"); + createDirectory(getTapeDir(level_subdir), "level tape data"); +} + boolean LoadLevelInfo() { int i; @@ -213,21 +269,17 @@ void LoadLevelTape(int level_nr) FILE *file; boolean levelrec_10 = FALSE; -#ifndef MSDOS - sprintf(filename,"%s/%s/%d.tape", - level_directory,leveldir[leveldir_nr].filename,level_nr); -#else - sprintf(filename,"%s/%s/%d.tap", - level_directory,leveldir[leveldir_nr].filename,level_nr); -#endif + sprintf(filename, "%s/%d.%s", + getTapeDir(leveldir[leveldir_nr].filename), + level_nr, TAPEFILE_EXTENSION); - if ((file=fopen(filename,"r"))) + if ((file = fopen(filename, "r"))) { - fgets(cookie,LEVELREC_COOKIE_LEN,file); + fgets(cookie, LEVELREC_COOKIE_LEN, file); fgetc(file); - if (!strcmp(cookie,LEVELREC_COOKIE_10)) /* old 1.0 tape format */ + if (!strcmp(cookie, LEVELREC_COOKIE_10)) /* old 1.0 tape format */ levelrec_10 = TRUE; - else if (strcmp(cookie,LEVELREC_COOKIE)) /* unknown tape format */ + else if (strcmp(cookie, LEVELREC_COOKIE)) /* unknown tape format */ { Error(ERR_WARN, "wrong format of level recording file '%s'", filename); fclose(file); @@ -253,7 +305,7 @@ void LoadLevelTape(int level_nr) tape.playing = FALSE; tape.pausing = FALSE; - for(i=0;i0) + if (levelrec_10 && j > 0) { tape.pos[i].action[j] = MV_NO_MOVING; continue; @@ -272,6 +324,34 @@ void LoadLevelTape(int level_nr) tape.pos[i].delay = fgetc(file); + if (levelrec_10) + { + /* eliminate possible diagonal moves in old tapes */ + /* this is only for backward compatibility */ + + byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN }; + byte action = tape.pos[i].action[0]; + int k, num_moves = 0; + + for (k=0; k<4; k++) + { + if (action & joy_dir[k]) + { + tape.pos[i + num_moves].action[0] = joy_dir[k]; + if (num_moves > 0) + tape.pos[i + num_moves].delay = 0; + num_moves++; + } + } + + if (num_moves > 1) + { + num_moves--; + i += num_moves; + tape.length += num_moves; + } + } + if (feof(file)) break; } @@ -291,32 +371,30 @@ void SaveLevelTape(int level_nr) FILE *file; boolean new_tape = TRUE; -#ifndef MSDOS - sprintf(filename,"%s/%s/%d.tape", - level_directory,leveldir[leveldir_nr].filename,level_nr); -#else - sprintf(filename,"%s/%s/%d.tap", - level_directory,leveldir[leveldir_nr].filename,level_nr); -#endif + sprintf(filename, "%s/%d.%s", + getTapeDir(leveldir[leveldir_nr].filename), + level_nr, TAPEFILE_EXTENSION); + + InitTapeDirectory(leveldir[leveldir_nr].filename); /* Testen, ob bereits eine Aufnahme existiert */ - if ((file=fopen(filename,"r"))) + if ((file = fopen(filename, "r"))) { new_tape = FALSE; fclose(file); - if (!Request("Replace old tape ?",REQ_ASK)) + if (!Request("Replace old tape ?", REQ_ASK)) return; } - if (!(file=fopen(filename,"w"))) + if (!(file = fopen(filename, "w"))) { Error(ERR_WARN, "cannot save level recording file '%s'", filename); return; } - fputs(LEVELREC_COOKIE,file); /* Formatkennung */ - fputc(0x0a,file); + fputs(LEVELREC_COOKIE, file); /* Formatkennung */ + fputc(0x0a, file); fputc((tape.random_seed >> 24) & 0xff,file); fputc((tape.random_seed >> 16) & 0xff,file); @@ -333,14 +411,14 @@ void SaveLevelTape(int level_nr) fputc((tape.length >> 8) & 0xff,file); fputc((tape.length >> 0) & 0xff,file); - for(i=0;itoken, token) == 0) return setup_file_list->value; else - return getSetupFileListEntry(setup_file_list->next, token); + return getTokenValue(setup_file_list->next, token); } -boolean setSetupFileListEntry(struct SetupFileList *setup_file_list, - char *token, char *value) +static void setTokenValue(struct SetupFileList *setup_file_list, + char *token, char *value) { if (!setup_file_list) - return FALSE; + return; if (strcmp(setup_file_list->token, token) == 0) { free(setup_file_list->value); setup_file_list->value = checked_malloc(strlen(value) + 1); strcpy(setup_file_list->value, value); - - return TRUE; } + else if (setup_file_list->next == NULL) + setup_file_list->next = newSetupFileList(token, value); else - return setSetupFileListEntry(setup_file_list->next, token, value); -} - -void updateSetupFileListEntry(struct SetupFileList *setup_file_list, - char *token, char *value) -{ - if (!setup_file_list) - return; - - if (getSetupFileListEntry(setup_file_list, token) != NULL) - setSetupFileListEntry(setup_file_list, token, value); - else - { - struct SetupFileList *list_entry = setup_file_list; - - while (list_entry->next) - list_entry = list_entry->next; - - list_entry->next = newSetupFileList(token, value); - } + setTokenValue(setup_file_list->next, token, value); } #ifdef DEBUG @@ -958,7 +852,7 @@ static struct SetupFileList *loadSetupFileList(char *filename) break; if (*token && *value) - updateSetupFileListEntry(setup_file_list, token, value); + setTokenValue(setup_file_list, token, value); } fclose(file); @@ -1001,155 +895,112 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, } } -static void decodeSetupFileList(struct SetupFileList *setup_file_list) +static void setSetupInfoToDefaults(struct SetupInfo *si) { int i; - int token_nr = TOKEN_INVALID; - int player_nr = 0; - char *token; - char *token_value; - boolean token_boolean_value; - int token_integer_value; - int token_player_prefix_len; - - if (!setup_file_list) - return; - - token = setup_file_list->token; - token_value = setup_file_list->value; - token_boolean_value = get_string_boolean_value(token_value); - token_integer_value = get_string_integer_value(token_value); - token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX); + si->sound = TRUE; + si->sound_loops = FALSE; + si->sound_music = FALSE; + si->sound_simple = FALSE; + si->toons = TRUE; + si->double_buffering = TRUE; + si->direct_draw = !si->double_buffering; + si->scroll_delay = FALSE; + si->soft_scrolling = TRUE; + si->fading = FALSE; + si->autorecord = FALSE; + si->quick_doors = FALSE; + + strncpy(si->login_name, getLoginName(), MAX_NAMELEN-1); + si->login_name[MAX_NAMELEN-1] = '\0'; + strncpy(si->alias_name, getLoginName(), MAX_NAMELEN-1); + si->alias_name[MAX_NAMELEN-1] = '\0'; - if (strncmp(token, TOKEN_STR_PLAYER_PREFIX, - token_player_prefix_len) == 0) + for (i=0; i= '0' && *token <= '9') - { - player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS; - token++; - } + si->input[i].use_joystick = FALSE; + strcpy(si->input[i].joy.device_name, joystick_device_name[i]); + si->input[i].joy.xleft = JOYSTICK_XLEFT; + si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE; + si->input[i].joy.xright = JOYSTICK_XRIGHT; + si->input[i].joy.yupper = JOYSTICK_YUPPER; + 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].key.left = (i == 0 ? DEFAULT_KEY_LEFT : KEY_UNDEFINDED); + si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED); + si->input[i].key.up = (i == 0 ? DEFAULT_KEY_UP : KEY_UNDEFINDED); + si->input[i].key.down = (i == 0 ? DEFAULT_KEY_DOWN : KEY_UNDEFINDED); + si->input[i].key.snap = (i == 0 ? DEFAULT_KEY_SNAP : KEY_UNDEFINDED); + si->input[i].key.bomb = (i == 0 ? DEFAULT_KEY_BOMB : KEY_UNDEFINDED); } +} - for (i=0; inext); + if (!setup_file_list) + return; + + /* handle global setup values */ + si = setup; + for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++) + setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text)); + setup = si; + + /* handle player specific setup values */ + for (pnr=0; pnr