Browse Source

core: make Entity::GetName() a public method.

legacy
Sam Hocevar sam 13 years ago
parent
commit
2d63ce189f
2 changed files with 6 additions and 3 deletions
  1. +3
    -1
      src/entity.h
  2. +3
    -2
      src/worldentity.h

+ 3
- 1
src/entity.h View File

@@ -31,11 +31,13 @@ class Entity
friend class Dict; friend class Dict;
friend class Emcee; friend class Emcee;


public:
virtual char const *GetName();

protected: protected:
Entity(); Entity();
virtual ~Entity(); virtual ~Entity();


virtual char const *GetName();
inline int IsDestroying() { return m_destroy; } inline int IsDestroying() { return m_destroy; }


virtual void TickGame(float seconds); virtual void TickGame(float seconds);


+ 3
- 2
src/worldentity.h View File

@@ -23,6 +23,9 @@ namespace lol


class WorldEntity : public Entity class WorldEntity : public Entity
{ {
public:
virtual char const *GetName();

public: public:
vec3 m_position; vec3 m_position;
vec3 m_velocity; vec3 m_velocity;
@@ -38,8 +41,6 @@ protected:
WorldEntity(); WorldEntity();
virtual ~WorldEntity(); virtual ~WorldEntity();


virtual char const *GetName();

virtual void TickGame(float seconds); virtual void TickGame(float seconds);
virtual void TickDraw(float seconds); virtual void TickDraw(float seconds);
}; };


Loading…
Cancel
Save