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

Add missing mod directories, and remove 'autoload' from trunk as well. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7686 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2009-06-08 02:38:31 +00:00 committed by Git SVN Gateway
parent f2a6546000
commit 0e7ef7d20c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/init.c
View File

@ -256,12 +256,10 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force )
#endif // DEBUG
// Remove maps and mods
removeSubdirs( curSearchPath->path, "maps", NULL );
removeSubdirs( curSearchPath->path, "mods/music", NULL );
removeSubdirs( curSearchPath->path, "mods/global", global_mods );
removeSubdirs( curSearchPath->path, "mods/global/autoload", NULL );
removeSubdirs( curSearchPath->path, "mods/campaign", campaign_mods );
removeSubdirs( curSearchPath->path, "mods/campaign/autoload", NULL );
removeSubdirs( curSearchPath->path, "mods/multiplay", multiplay_mods );
removeSubdirs( curSearchPath->path, "mods/multiplay/autoload", NULL );
// Remove multiplay patches
sstrcpy(tmpstr, curSearchPath->path);
@ -300,10 +298,9 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force )
// Add global and campaign mods
PHYSFS_addToSearchPath( curSearchPath->path, PHYSFS_APPEND );
addSubdirs( curSearchPath->path, "mods/music", PHYSFS_APPEND, NULL );
addSubdirs( curSearchPath->path, "mods/global", PHYSFS_APPEND, global_mods );
addSubdirs( curSearchPath->path, "mods/global/autoload", PHYSFS_APPEND, NULL );
addSubdirs( curSearchPath->path, "mods/campaign", PHYSFS_APPEND, campaign_mods );
addSubdirs( curSearchPath->path, "mods/campaign/autoload", PHYSFS_APPEND, NULL );
if (!PHYSFS_removeFromSearchPath( curSearchPath->path ))
{
debug(LOG_ERROR, "Failed to remove path %s again", curSearchPath->path);
@ -339,10 +336,10 @@ BOOL rebuildSearchPath( searchPathMode mode, BOOL force )
// Add maps and global and multiplay mods
PHYSFS_addToSearchPath( curSearchPath->path, PHYSFS_APPEND );
addSubdirs( curSearchPath->path, "maps", PHYSFS_APPEND, NULL );
addSubdirs( curSearchPath->path, "mods/music", PHYSFS_APPEND, NULL );
addSubdirs( curSearchPath->path, "mods/global", PHYSFS_APPEND, global_mods );
addSubdirs( curSearchPath->path, "mods/global/autoload", PHYSFS_APPEND, NULL );
addSubdirs( curSearchPath->path, "mods/multiplay", PHYSFS_APPEND, multiplay_mods );
addSubdirs( curSearchPath->path, "mods/multiplay/autoload", PHYSFS_APPEND, NULL );
PHYSFS_removeFromSearchPath( curSearchPath->path );
// Add multiplay patches