From 2d63ce189f70bcedeec1dc193b302ce4fc1c6d28 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 24 Sep 2012 06:43:57 +0000 Subject: [PATCH] core: make Entity::GetName() a public method. --- src/entity.h | 4 +++- src/worldentity.h | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/entity.h b/src/entity.h index 573f1b96..042a7c17 100644 --- a/src/entity.h +++ b/src/entity.h @@ -31,11 +31,13 @@ class Entity friend class Dict; friend class Emcee; +public: + virtual char const *GetName(); + protected: Entity(); virtual ~Entity(); - virtual char const *GetName(); inline int IsDestroying() { return m_destroy; } virtual void TickGame(float seconds); diff --git a/src/worldentity.h b/src/worldentity.h index 9ca8bb22..76ffca35 100644 --- a/src/worldentity.h +++ b/src/worldentity.h @@ -23,6 +23,9 @@ namespace lol class WorldEntity : public Entity { +public: + virtual char const *GetName(); + public: vec3 m_position; vec3 m_velocity; @@ -38,8 +41,6 @@ protected: WorldEntity(); virtual ~WorldEntity(); - virtual char const *GetName(); - virtual void TickGame(float seconds); virtual void TickDraw(float seconds); };