- heavy changes to VFS tree internals: now allows loose files and archives to coexist, choosing archive if they're the same date+size
- reworked tree_lookup: dir names now require trailing '/' to disambiguate. exception: vfs_open_dir (convenience) - display VFS tree in stdout.txt unless g_Quickstart This was SVN commit r1466.
This commit is contained in:
parent
e15562b7ae
commit
e76871e7b0
File diff suppressed because it is too large
Load Diff
@ -64,6 +64,8 @@ extern int vfs_make_vfs_path(const char* path, char* vfs_path);
|
||||
extern int vfs_make_real_path(const char* vfs_path, char* path);
|
||||
|
||||
|
||||
extern int vfs_display();
|
||||
|
||||
//
|
||||
// directory entry
|
||||
//
|
||||
|
@ -732,8 +732,10 @@ static void InitVfs(char* argv0)
|
||||
// L"argv[0] is probably incorrect. please start the game via command-line.");
|
||||
|
||||
vfs_mount("", "mods/official", 0);
|
||||
vfs_mount("screenshots", "screenshots", 0);
|
||||
vfs_mount("profiles", "profiles", 0 );
|
||||
vfs_mount("screenshots/", "screenshots", 0);
|
||||
vfs_mount("profiles/", "profiles", 0 );
|
||||
|
||||
// don't try vfs_display yet: SDL_Init hasn't yet redirected stdout
|
||||
}
|
||||
|
||||
static void psInit()
|
||||
@ -956,7 +958,10 @@ sle(11340106);
|
||||
SDL_WM_SetCaption("0 A.D.", "0 A.D.");
|
||||
|
||||
if(!g_Quickstart)
|
||||
{
|
||||
WriteSysInfo();
|
||||
vfs_display();
|
||||
}
|
||||
else
|
||||
// speed up startup by disabling all sound
|
||||
// (OpenAL init will be skipped).
|
||||
|
Loading…
Reference in New Issue
Block a user