From 2a2a896bc7d3459edda03017666dce48567a9b25 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 13 Mar 2017 23:54:55 +0300 Subject: Dont mount branding directory on windows. --- src/dirs.cpp | 9 ++------- 1 file 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() -- cgit v1.2.3-60-g2f50