瀏覽代碼

Merge pull request #38 from josch/vcmiserver-handle-options-first

let vcmiserver handle commandline options first
Ivan Savenko 11 年之前
父節點
當前提交
0e2cc54252
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      server/CVCMIServer.cpp

+ 4 - 4
server/CVCMIServer.cpp

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