PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-01 11:06:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

GetDataFilePath: change order of lookup paths and remove "../data"

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2017-09-20 18:13:49 +02:00
parent a3cda7ba50
commit 56ea82d526
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/utils.c
View file

@ -287,29 +287,27 @@ SYMBOL_EXPORT char* GetGameName(struct Game* game, char* format) {
static char* TestDataFilePath(struct Game* game, char* filename) { static char* TestDataFilePath(struct Game* game, char* filename) {
char* result = NULL; char* result = NULL;
if (al_filename_exists(filename)) {
return strdup(filename);
}
{
char origfn[255] = "data/";
strncat(origfn, filename, 249);
if (al_filename_exists(origfn)) {
return strdup(origfn);
}
}
TestPath(filename, "data/", &result); TestPath(filename, "data/", &result);
TestPath(filename, GetGameName(game, "../share/%s/data/"), &result); TestPath(filename, GetGameName(game, "../share/%s/data/"), &result);
TestPath(filename, "../data/", &result);
#ifdef ALLEGRO_MACOSX #ifdef ALLEGRO_MACOSX
TestPath(filename, "../Resources/data/", &result); TestPath(filename, "../Resources/data/", &result);
TestPath(filename, "../Resources/gamestates/", &result); TestPath(filename, "../Resources/gamestates/", &result);
#endif #endif
return result; if (result) {
return result;
}
// try current working directory if everything else fails
char origfn[255] = "data/";
strncat(origfn, filename, 249);
if (al_filename_exists(origfn)) {
return strdup(origfn);
}
return NULL;
} }
SYMBOL_EXPORT char* GetDataFilePath(struct Game* game, char* filename) { SYMBOL_EXPORT char* GetDataFilePath(struct Game* game, char* filename) {