From 846d16315a8b5a81fbc37d66da4d1254038ec494 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sat, 9 May 2015 11:16:56 +0200
Subject: CheckBasicStyle: checks spaces around * and &.

---
 src/Root.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Root.h')

diff --git a/src/Root.h b/src/Root.h
index 2f9d1eb2c..e0b6cf26c 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -218,7 +218,7 @@ private:
 	/// Does the actual work of executing a command
 	void DoExecuteConsoleCommand(const AString & a_Cmd);
 	
-	static cRoot* s_Root;
+	static cRoot * s_Root;
 
 	static void InputThread(cRoot & a_Params);
 };  // tolua_export
-- 
cgit v1.2.3


From b9efa02c80b54e044326771bbffdddf206daef2e Mon Sep 17 00:00:00 2001
From: tycho <tycho@localhost>
Date: Thu, 14 May 2015 15:47:51 +0100
Subject: Initial implementation of IniFile overloading

---
 src/Root.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Root.h')

diff --git a/src/Root.h b/src/Root.h
index e0b6cf26c..2b30afaff 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -24,6 +24,7 @@ class cWorld;
 class cPlayer;
 class cCommandOutputCallback;
 class cCompositeChat;
+class cSettingsRepositoryInterface;
 
 typedef cItemCallback<cPlayer> cPlayerListCallback;
 typedef cItemCallback<cWorld>  cWorldListCallback;
@@ -53,7 +54,7 @@ public:
 	cRoot(void);
 	~cRoot();
 
-	void Start(void);
+	void Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo);
 
 	// tolua_begin
 	cServer * GetServer(void) { return m_Server; }
@@ -204,7 +205,7 @@ private:
 	void LoadGlobalSettings();
 
 	/// Loads the worlds from settings.ini, creates the worldmap
-	void LoadWorlds(cIniFile & IniFile);
+	void LoadWorlds(cSettingsRepositoryInterface & a_Settings);
 	
 	/// Starts each world's life
 	void StartWorlds(void);
-- 
cgit v1.2.3