diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-11-19 21:25:27 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-11-19 21:25:27 +0300 |
commit | 7225c69c5bf2de13d32d6e9a658779405c8e2707 (patch) | |
tree | 5fbd69d62ae8bd65b7b7a2e9986041aee4829888 /src/dyetool | |
parent | c0af9f41451d782b316feea8cf93fc50d4bd6733 (diff) | |
download | manaverse-7225c69c5bf2de13d32d6e9a658779405c8e2707.tar.gz manaverse-7225c69c5bf2de13d32d6e9a658779405c8e2707.tar.bz2 manaverse-7225c69c5bf2de13d32d6e9a658779405c8e2707.tar.xz manaverse-7225c69c5bf2de13d32d6e9a658779405c8e2707.zip |
Add strong typed bool enum Append.
Diffstat (limited to 'src/dyetool')
-rw-r--r-- | src/dyetool/client.cpp | 13 | ||||
-rw-r--r-- | src/dyetool/dyemain.cpp | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index fcd978d12..3055cc80b 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -246,10 +246,13 @@ void Client::gameInit() // Add the main data directories to our PhysicsFS search path if (!settings.options.dataPath.empty()) - resourceManager->addToSearchPath(settings.options.dataPath, false); + { + resourceManager->addToSearchPath(settings.options.dataPath, + Append_false); + } // Add the local data directory to PhysicsFS search path - resourceManager->addToSearchPath(settings.localDataDir, false); + resourceManager->addToSearchPath(settings.localDataDir, Append_false); TranslationManager::loadCurrentLang(); WindowManager::initTitle(); @@ -595,7 +598,7 @@ int Client::gameExec() resourceManager->searchAndAddArchives( "customdata/", "zip", - false); + Append_false); } if (!settings.options.skipUpdate) @@ -603,11 +606,11 @@ int Client::gameExec() resourceManager->searchAndAddArchives( settings.updatesDir + "/local/", "zip", - false); + Append_false); resourceManager->addToSearchPath(settings.localDataDir + dirSeparator + settings.updatesDir + "/local/", - false); + Append_false); } logger->log("Init paths"); diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp index 1b8666aee..66a2adf18 100644 --- a/src/dyetool/dyemain.cpp +++ b/src/dyetool/dyemain.cpp @@ -77,8 +77,8 @@ int main(int argc, char **argv) ResourceManager::init(); resourceManager->setWriteDir("."); - resourceManager->addToSearchPath(".", false); - resourceManager->addToSearchPath("/", false); + resourceManager->addToSearchPath(".", Append_false); + resourceManager->addToSearchPath("/", Append_false); std::string src = argv[1]; std::string dst; if (argc == 4) |