diff options
Diffstat (limited to 'src/core/entity.h')
| -rw-r--r-- | src/core/entity.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index 2b2ed00..30e3356 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -47,7 +47,7 @@ public: enum Shape {Diamond=0, Sphere=1, Cube=2, Axis=3}; /// EntityDynamic event state classes - enum Event {Normal=0, ImpulseInitiate=2, Impulse=3, JumpInitiate=4, Jump=5}; + enum Event {Normal=0, NoPower=1, ImpulseInitiate=2, Impulse=3, JumpInitiate=4, Jump=5}; /// create a new entity and add it to the registry Entity(unsigned int flags = 0); @@ -137,7 +137,7 @@ public: virtual void receive_server_update(std::istream &is); /// mark the entity as destroyed - void die(); + virtual void die(); /// runs one game frame for the entity /** @@ -276,8 +276,9 @@ public: /// speed of the entity float entity_speed; -protected: unsigned int entity_eventstate; + +protected: float entity_timer; }; |