From 31959bc355c471c573828bf63932850e46c4b5bc Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 9 Feb 2008 23:06:00 +0000 Subject: more entities --- src/core/core.h | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'src/core/core.h') diff --git a/src/core/core.h b/src/core/core.h index 6a2d855..0e23386 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,30 +1,42 @@ /* core/core.h - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ #ifndef __INCLUDED_CORE_H__ #define __INCLUDED_CORE_H__ -#include "core/clientstate.h" +#include "core/player.h" #include "core/gameinterface.h" #include "core/application.h" /// core contains the basic functionality of the engine namespace core { - /// pointer to the current GameInterface - inline GameInterface *game() { return GameInterface::instance(); } +/// pointer to the current GameInterface +inline GameInterface *game() +{ + return GameInterface::instance(); +} - /// pointer to the current ApplicationInterface - inline Application *application() { return Application::instance(); } +/// pointer to the current ApplicationInterface +inline Application *application() +{ + return Application::instance(); +} - /// true if the core is connected to a game module - inline bool connected() { return (GameInterface::instance() && GameInterface::instance()->connected); } +/// true if the core is connected to a game module +inline bool connected() +{ + return (GameInterface::instance() && GameInterface::instance()->connected); +} - /// return the time the core has been running, in seconds - inline float time() { return Application::instance()->current_time; } +/// return the time the core has been running, in seconds +inline float time() +{ + return Application::instance()->current_time; +} }; #include "core/commandbuffer.h" -- cgit v1.2.3