diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-13 23:54:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-13 23:54:55 +0300 |
| commit | 2a2a896bc7d3459edda03017666dce48567a9b25 (patch) | |
| tree | 1260d0ae7300d6af6947aff6151a95fcc1b4d456 /src/dirs.cpp | |
| parent | d131f4bdfe5ec3f462239490f69a5785abfd52bc (diff) | |
| download | manaplus-2a2a896bc7d3459edda03017666dce48567a9b25.tar.gz manaplus-2a2a896bc7d3459edda03017666dce48567a9b25.tar.bz2 manaplus-2a2a896bc7d3459edda03017666dce48567a9b25.tar.xz manaplus-2a2a896bc7d3459edda03017666dce48567a9b25.zip | |
Dont mount branding directory on windows.
Diffstat (limited to 'src/dirs.cpp')
| -rw-r--r-- | src/dirs.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index a55953a0b..d0352adfd 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -233,20 +233,14 @@ void Dirs::mountDataDir() VirtFs::mountZip("/http/data.zip", Append_false); #endif // defined __native_client__ +#ifndef WIN32 // Add branding/data to PhysFS search path if (!settings.options.brandingPath.empty()) { std::string path = settings.options.brandingPath; // Strip blah.manaplus from the path -#ifdef WIN32 - const int loc1 = path.find_last_of('/'); - const int loc2 = path.find_last_of('\\'); - const int loc = CAST_S32(std::max(loc1, loc2)); -#else // WIN32 - const int loc = CAST_S32(path.find_last_of('/')); -#endif // WIN32 if (loc > 0) { @@ -255,6 +249,7 @@ void Dirs::mountDataDir() Append_false); } } +#endif // WIN32 } void Dirs::initRootDir() |