1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00

Final part of the merge

Merging VCMI Dirs refactoring + GUI refactoring with current develop
This commit is contained in:
Ivan Savenko
2014-09-04 20:59:07 +03:00
30 changed files with 228 additions and 858 deletions

View File

@@ -599,14 +599,14 @@ int main(int argc, char** argv)
CBasicLogConfigurator logConfig(VCMIDirs::get().userCachePath() / "VCMI_Server_log.txt", console);
logConfig.configureDefault();
preinitDLL(console);
settings.init();
logConfig.configure();
handleCommandOptions(argc, argv);
port = cmdLineOptions["port"].as<int>();
logNetwork->infoStream() << "Port " << port << " will be used.";
preinitDLL(console);
settings.init();
logConfig.configure();
loadDLLClasses();
srand ( (ui32)time(nullptr) );
try