projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990317-1-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index d3e85c3f1417f0fd713d6011d047e1e623c1bb68..000992012cb38657d255a7f4e9bdd9f6d34644fb 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-116,11
+116,6
@@
static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */
static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */
static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */
static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */
-static char *getGlobalDataDir()
-{
- return GAME_DIR;
-}
-
char *getUserDataDir()
{
static char *userdata_dir = NULL;
char *getUserDataDir()
{
static char *userdata_dir = NULL;
@@
-178,7
+173,7
@@
static char *getTapeDir(char *level_subdir)
static char *getScoreDir(char *level_subdir)
{
static char *score_dir = NULL;
static char *getScoreDir(char *level_subdir)
{
static char *score_dir = NULL;
- char *data_dir =
getGlobalDataDir()
;
+ char *data_dir =
options.rw_base_directory
;
char *score_subdir = SCORES_DIRECTORY;
if (score_dir)
char *score_subdir = SCORES_DIRECTORY;
if (score_dir)
@@
-493,6
+488,9
@@
void LoadLevel(int level_nr)
Error(ERR_WARN, "using high speed movement for player");
level.double_speed = TRUE;
}
Error(ERR_WARN, "using high speed movement for player");
level.double_speed = TRUE;
}
+
+ /* determine border element for this level */
+ SetBorderElement();
}
void SaveLevel(int level_nr)
}
void SaveLevel(int level_nr)
@@
-829,15
+827,15
@@
void LoadScore(int level_nr)
fscanf(file, "%d", &highscore[i].Score);
fgets(line, MAX_LINE_LEN, file);
fscanf(file, "%d", &highscore[i].Score);
fgets(line, MAX_LINE_LEN, file);
- if (line[strlen(line)
-
1] == '\n')
- line[strlen(line)
-
1] = '\0';
+ if (line[strlen(line)
-
1] == '\n')
+ line[strlen(line)
-
1] = '\0';
for (line_ptr = line; *line_ptr; line_ptr++)
{
if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
{
for (line_ptr = line; *line_ptr; line_ptr++)
{
if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
{
- strncpy(highscore[i].Name, line_ptr, MAX_
NAMELEN - 1
);
- highscore[i].Name[MAX_
NAMELEN - 1
] = '\0';
+ strncpy(highscore[i].Name, line_ptr, MAX_
PLAYER_NAME_LEN
);
+ highscore[i].Name[MAX_
PLAYER_NAME_LEN
] = '\0';
break;
}
}
break;
}
}
@@
-1574,11
+1572,11
@@
void LoadSetup()
freeSetupFileList(setup_file_list);
/* needed to work around problems with fixed length strings */
freeSetupFileList(setup_file_list);
/* needed to work around problems with fixed length strings */
- if (strlen(setup.player_name) >
= MAX_NAME
LEN)
- setup.player_name[MAX_
NAMELEN - 1
] = '\0';
- else if (strlen(setup.player_name) < MAX_
NAMELEN - 1
)
+ if (strlen(setup.player_name) >
MAX_PLAYER_NAME_
LEN)
+ setup.player_name[MAX_
PLAYER_NAME_LEN
] = '\0';
+ else if (strlen(setup.player_name) < MAX_
PLAYER_NAME_LEN
)
{
{
- char *new_name = checked_malloc(MAX_
NAMELEN
);
+ char *new_name = checked_malloc(MAX_
PLAYER_NAME_LEN + 1
);
strcpy(new_name, setup.player_name);
free(setup.player_name);
strcpy(new_name, setup.player_name);
free(setup.player_name);