1 files changed, 10 insertions, 20 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 0e23386..a3c5f0d 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -7,41 +7,31 @@
 #ifndef __INCLUDED_CORE_H__
 #define __INCLUDED_CORE_H__
 
+#include "core/entity.h"
 #include "core/player.h"
 #include "core/gameinterface.h"
 #include "core/application.h"
+#include "core/commandbuffer.h"
+#include "core/cvar.h"
+#include "core/func.h"
 
 /// core contains the basic functionality of the engine
 namespace core
 {
+
 /// pointer to the current GameInterface
-inline GameInterface *game()
-{
-	return GameInterface::instance();
-}
+GameInterface *game();
 
 /// pointer to the current ApplicationInterface
-inline Application *application()
-{
-	return Application::instance();
-}
+Application *application();
 
 /// true if the core is connected to a game module
-inline bool connected()
-{
-	return (GameInterface::instance() && GameInterface::instance()->connected);
-}
+bool connected();
 
 /// return the time the core has been running, in seconds
-inline float time()
-{
-	return Application::instance()->current_time;
-}
-};
+float time();
 
-#include "core/commandbuffer.h"
-#include "core/cvar.h"
-#include "core/func.h"
+}
 
 #endif // __INCLUDED_CORE_H__