4 files changed, 9 insertions, 17 deletions

diff --git a/source/Authenticator.cpp b/source/Authenticator.cpp
index a45617f93..a8aad524f 100644
--- a/source/Authenticator.cpp
+++ b/source/Authenticator.cpp
@@ -28,7 +28,6 @@ cAuthenticator::cAuthenticator(void) :
 	m_Address(DEFAULT_AUTH_ADDRESS),
 	m_ShouldAuthenticate(true)
 {
-	ReadINI();
 }
 
 
@@ -45,14 +44,8 @@ cAuthenticator::~cAuthenticator()
 
 
 /// Read custom values from INI
-void cAuthenticator::ReadINI(void)
+void cAuthenticator::ReadINI(cIniFile IniFile)
 {
-	cIniFile IniFile("settings.ini");
-	if (!IniFile.ReadFile())
-	{
-		return;
-	}
-	
 	m_Server  = IniFile.GetValue("Authentication", "Server");
 	m_Address = IniFile.GetValue("Authentication", "Address");
 	m_ShouldAuthenticate = IniFile.GetValueB("Authentication", "Authenticate", true);
@@ -100,8 +93,9 @@ void cAuthenticator::Authenticate(int a_ClientID, const AString & a_UserName, co
 
 
 
-void cAuthenticator::Start(void)
+void cAuthenticator::Start(cIniFile IniFile)
 {
+	ReadINI(IniFile);
 	m_ShouldTerminate = false;
 	super::Start();
 }
diff --git a/source/Authenticator.h b/source/Authenticator.h
index 868476d80..9c7c57e6d 100644
--- a/source/Authenticator.h
+++ b/source/Authenticator.h
@@ -37,13 +37,13 @@ public:
 	~cAuthenticator();
 
 	/// (Re-)read server and address from INI:
-	void ReadINI(void);
+	void ReadINI(cIniFile IniFile);
 
 	/// Queues a request for authenticating a user. If the auth fails, the user is kicked
 	void Authenticate(int a_ClientID, const AString & a_UserName, const AString & a_ServerHash);
 
 	/// Starts the authenticator thread. The thread may be started and stopped repeatedly
-	void Start(void);
+	void Start(cIniFile IniFile);
 	
 	/// Stops the authenticator thread. The thread may be started and stopped repeatedly
 	void Stop(void);
diff --git a/source/Root.cpp b/source/Root.cpp
index 1f6437784..df98c3537 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -149,7 +149,7 @@ void cRoot::Start(void)
 		m_FurnaceRecipe   = new cFurnaceRecipe();
 		
 		LOGD("Loading worlds...");
-		LoadWorlds();
+		LoadWorlds(IniFile);
 
 		LOGD("Loading plugin manager...");
 		m_PluginManager = new cPluginManager();
@@ -160,7 +160,7 @@ void cRoot::Start(void)
 
 		// This sets stuff in motion
 		LOGD("Starting Authenticator...");
-		m_Authenticator.Start();
+		m_Authenticator.Start(IniFile);
 		
 		LOGD("Starting worlds...");
 		StartWorlds();
@@ -245,10 +245,8 @@ void cRoot::LoadGlobalSettings()
 
 
 
-void cRoot::LoadWorlds(void)
+void cRoot::LoadWorlds(cIniFile IniFile)
 {
-	cIniFile IniFile("settings.ini"); IniFile.ReadFile();
-
 	// First get the default world
 	AString DefaultWorldName = IniFile.GetValueSet("Worlds", "DefaultWorld", "world");
 	m_pDefaultWorld = new cWorld( DefaultWorldName.c_str() );
diff --git a/source/Root.h b/source/Root.h
index c05b29d14..6bd8217d9 100644
--- a/source/Root.h
+++ b/source/Root.h
@@ -162,7 +162,7 @@ private:
 	void LoadGlobalSettings();
 
 	/// Loads the worlds from settings.ini, creates the worldmap
-	void LoadWorlds(void);
+	void LoadWorlds(cIniFile IniFile);
 	
 	/// Starts each world's life
 	void StartWorlds(void);