Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick crashfix for Windows, regarding datadir recognition. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@403 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2006-03-05 14:29:32 +00:00
parent e36796f6ce
commit 06966cc158
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@ -99,7 +99,7 @@ BOOL checkDisableLobby(void)
***************************************************************************/
static void find_data_dir(void)
{
printf("Finding data dir\n");
debug(LOG_WZ, "Finding data dir\n");
/* Do we have a user supplied data dir? It must point to a directory with gamedesc.lev or
* a warzone.wz with this file inside. */
if (datadir[0] != '\0') {
@ -148,11 +148,13 @@ static void find_data_dir(void)
/* Check for warzone.wz in Unixland system data directory and check if we are running
* straight out of the build directory (for convenience). */
strcpy(datadir, PHYSFS_getBaseDir());
*strrchr(datadir, '/') = '\0'; // Trim ending '/', which getBaseDir always provides
if (strcmp(strrchr(datadir, '/'), "/bin" ) == 0) {
strcpy(strrchr(datadir, '/'), "/share/warzone/warzone.wz" );
} else if (strcmp(strrchr(datadir, '/'), "/src" ) == 0 ) {
strcpy( strrchr( datadir, '/' ), "/data" );
if( strrchr(datadir, '/') != NULL ) { // Skip this on Windows, where '/' is not the dirSeperator
*strrchr(datadir, '/') = '\0'; // Trim ending '/', which getBaseDir always provides
if (strcmp(strrchr(datadir, '/'), "/bin" ) == 0) {
strcpy(strrchr(datadir, '/'), "/share/warzone/warzone.wz" );
} else if (strcmp(strrchr(datadir, '/'), "/src" ) == 0 ) {
strcpy( strrchr( datadir, '/' ), "/data" );
}
}
if (!PHYSFS_addToSearchPath(datadir, 1) || !PHYSFS_exists("gamedesc.lev")) {
debug(LOG_WZ, "Could not find data in \"%s\".", datadir);