Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix issues in 87a2c3347f

Browse Source 
Fixes 87a2c3347f:
- NoPCH was broken
- two warnings slipped through.

Differential Revision: https://code.wildfiregames.com/D3751
This was SVN commit r25147.
This commit is contained in:
wraitii 2021-03-28 07:01:34 +00:00
parent 2ee0e62a0e
commit b477892440
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/lib/file/vfs/tests/test_vfs_real_path.h
View File

@ -22,6 +22,7 @@
#include "lib/self_test.h"
#include "lib/file/vfs/vfs.h"
#include "lib/file/vfs/vfs_populate.h"
#include "lib/os_path.h"
@ -106,7 +107,7 @@ public:
g_VFS->Mount(L"mod", TEST_FOLDER / "mod_b" / "", 0, 0);
// For consistency, populate everything.
g_VFS->TextRepresentation().c_str();
ignore_result(g_VFS->TextRepresentation().c_str());
OsPath realPath;
g_VFS->GetDirectoryRealPath(L"mod", realPath);

2
source/ps/GameSetup/GameSetup.cpp
View File

@ -397,7 +397,7 @@ void MountMods(const Paths& paths, const std::vector<CStr>& mods)
size_t userFlags = VFS_MOUNT_WATCH|VFS_MOUNT_ARCHIVABLE;
size_t baseFlags = userFlags|VFS_MOUNT_MUST_EXIST;
size_t priority;
size_t priority = 0;
for (size_t i = 0; i < mods.size(); ++i)
{
priority = i + 1; // Mods are higher priority than regular mountings, which default to priority 0