Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
you can quite regardles of game state
[vor.git]
/
file.c
diff --git
a/file.c
b/file.c
index
b9bc7e2
..
18193b2
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-31,7
+31,7
@@
char *g_score_file;
mode_t g_score_mode;
char *
mode_t g_score_mode;
char *
-load_file(char *filename)
+add_path(char *filename)
{
static char r[MAX_PATH_LEN];
snprintf(r, MAX_PATH_LEN, "%s/%s", g_data_dir, filename);
{
static char r[MAX_PATH_LEN];
snprintf(r, MAX_PATH_LEN, "%s/%s", g_data_dir, filename);
@@
-61,10
+61,11
@@
find_data_dir(void)
char *data_options[3] = {
"./data",
getenv("VOR_DATA"),
char *data_options[3] = {
"./data",
getenv("VOR_DATA"),
- "/usr/share/vor"
+ DATA_PREFIX
};
for(i=0; i<3; i++) {
};
for(i=0; i<3; i++) {
+ if(!data_options[i]) continue;
g_data_dir = strdup(data_options[i]);
if(is_dir(g_data_dir)) return true;
}
g_data_dir = strdup(data_options[i]);
if(is_dir(g_data_dir)) return true;
}
@@
-79,9
+80,12
@@
find_data_dir(void)
int
find_score_file(void)
{
int
find_score_file(void)
{
- g_score_file = load_file("scores");
+ g_score_file = add_path("scores");
g_score_mode = 0111;
g_score_mode = 0111;
- if(is_file(g_score_file)) return true;
+ if(is_file(g_score_file)) {
+ g_score_file = strdup(g_score_file);
+ return true;
+ }
g_score_file = malloc(MAX_PATH_LEN);
snprintf(g_score_file, MAX_PATH_LEN,
g_score_file = malloc(MAX_PATH_LEN);
snprintf(g_score_file, MAX_PATH_LEN,