Merge branch 'master' into akkadius/logsys-global-to-singleton

eqlaunch/eqlaunch.cpp

@@ -33,8 +33,6 @@
 #include <signal.h>
 #include <time.h>
 
-PathManager path;
-
 bool RunLoops = false;
 
 void CatchSignal(int sig_num);
@@ -44,7 +42,7 @@ int main(int argc, char *argv[]) {
 	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	path.LoadPaths();
+	PathManager::Instance()->Init();
 
 	std::string launcher_name;
 	if(argc == 2) {