made engine an interface

3 files changed, 18 insertions, 35 deletions

diff --git a/src/engine/server/register.cpp b/src/engine/server/register.cpp
index 36b26f1e..20c7d173 100644
--- a/src/engine/server/register.cpp
+++ b/src/engine/server/register.cpp
@@ -3,7 +3,6 @@
 #include <base/system.h>
 #include <engine/shared/network.h>
 #include <engine/shared/config.h>
-#include <engine/shared/engine.h>
 #include <engine/console.h>
 #include <engine/masterserver.h>
 
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 5341a38c..7977c4fc 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -3,26 +3,22 @@
 
 #include <base/system.h>
 
-#include <engine/shared/config.h>
-#include <engine/shared/engine.h>
-
-#include <engine/shared/protocol.h>
-#include <engine/shared/snapshot.h>
+#include <engine/config.h>
+#include <engine/console.h>
+#include <engine/engine.h>
+#include <engine/map.h>
+#include <engine/masterserver.h>
+#include <engine/server.h>
+#include <engine/storage.h>
 
 #include <engine/shared/compression.h>
-
-#include <engine/shared/network.h>
 #include <engine/shared/config.h>
-#include <engine/shared/packer.h>
 #include <engine/shared/datafile.h>
 #include <engine/shared/demo.h>
-
-#include <engine/server.h>
-#include <engine/map.h>
-#include <engine/console.h>
-#include <engine/storage.h>
-#include <engine/masterserver.h>
-#include <engine/config.h>
+#include <engine/shared/network.h>
+#include <engine/shared/packer.h>
+#include <engine/shared/protocol.h>
+#include <engine/shared/snapshot.h>
 
 #include <mastersrv/mastersrv.h>
 
@@ -30,8 +26,8 @@
 #include "server.h"
 
 #if defined(CONF_FAMILY_WINDOWS) 
-	#define _WIN32_WINNT 0x0500
-	#define NOGDI
+	#define _WIN32_WINNT 0x0501
+	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
 #endif
 
@@ -1046,11 +1042,6 @@ int CServer::LoadMap(const char *pMapName)
 	return 1;
 }
 
-void CServer::InitEngine(const char *pAppname)
-{
-	m_Engine.Init(pAppname);
-}
-
 void CServer::InitRegister(CNetServer *pNetServer, IEngineMasterServer *pMasterServer, IConsole *pConsole)
 {
 	m_Register.Init(pNetServer, pMasterServer, pConsole);
@@ -1062,9 +1053,6 @@ int CServer::Run()
 	m_pMap = Kernel()->RequestInterface<IEngineMap>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
 
-	//snap_init_id();
-	net_init();
-	
 	//
 	Console()->RegisterPrintCallback(SendRconLineAuthed, this);
 
@@ -1495,14 +1483,11 @@ int main(int argc, const char **argv) // ignore_convention
 	}
 #endif
 
-	// init the engine
-	dbg_msg("server", "starting...");
 	CServer *pServer = CreateServer();
-	pServer->InitEngine("Teeworlds");
-	
 	IKernel *pKernel = IKernel::Create();
 
 	// create the components
+	IEngine *pEngine = CreateEngine("Teeworlds");
 	IEngineMap *pEngineMap = CreateEngineMap();
 	IGameServer *pGameServer = CreateGameServer();
 	IConsole *pConsole = CreateConsole(CFGFLAG_SERVER);
@@ -1516,6 +1501,7 @@ int main(int argc, const char **argv) // ignore_convention
 		bool RegisterFail = false;
 
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pServer); // register as both
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pEngine);
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IEngineMap*>(pEngineMap)); // register as both
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IMap*>(pEngineMap));
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pGameServer);
@@ -1530,7 +1516,7 @@ int main(int argc, const char **argv) // ignore_convention
 	}
 	
 	pConfig->Init();
-	pEngineMasterServer->Init(pServer->Engine());
+	pEngineMasterServer->Init();
 	pEngineMasterServer->Load();
 		
 	// register all console commands
@@ -1547,9 +1533,10 @@ int main(int argc, const char **argv) // ignore_convention
 	// restore empty config strings to their defaults
 	pConfig->RestoreStrings();
 	
-	pServer->Engine()->InitLogfile();
+	pEngine->InitLogfile();
 
 	// run the server
+	dbg_msg("server", "starting...");
 	pServer->Run();
 	
 	// free
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index 6bee026e..74b524a8 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -48,7 +48,6 @@ public:
 	class IGameServer *GameServer() { return m_pGameServer; }
 	class IConsole *Console() { return m_pConsole; }
 	class IStorage *Storage() { return m_pStorage; }
-	class CEngine *Engine() { return &m_Engine; }
 
 	class CClient
 	{
@@ -120,7 +119,6 @@ public:
 	int m_CurrentMapSize;	
 	
 	CDemoRecorder m_DemoRecorder;
-	CEngine m_Engine;
 	CRegister m_Register;
 	
 	CServer();
@@ -172,7 +170,6 @@ public:
 	char *GetMapName();
 	int LoadMap(const char *pMapName);
 
-	void InitEngine(const char *pAppname);
 	void InitRegister(CNetServer *pNetServer, IEngineMasterServer *pMasterServer, IConsole *pConsole);
 	int Run();