diff options
author | Stijn Buys <ingar@osirion.org> | 2008-11-08 10:17:37 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-11-08 10:17:37 +0000 |
commit | 4cad4a27677b0490d3ba0018bc3404961f925ed5 (patch) | |
tree | f9d59542f27f66a9fb4c8938f40aec66994449fc /src/core/entity.h | |
parent | 27ab3566118e77754fefb32a41ee06cf24a59dfe (diff) |
docking, bumps network protocol version
Diffstat (limited to 'src/core/entity.h')
-rw-r--r-- | src/core/entity.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index 149419b..09b52a1 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -35,7 +35,7 @@ class Entity { public: /// Entity flags - enum Flags {Static=1, Solid=2, Bright=4, Dock=8}; + enum Flags {Static=1, Solid=2, Bright=4, Dockable=8}; /// Entity type constants enum Type {Default=0, Dynamic=1, Controlable=2, Globe=3}; @@ -44,7 +44,7 @@ public: enum Shape {Diamond=0, Sphere=1, Cube=2, Axis=3}; /// EntityDynamic event state classes - enum Event {Normal=0, NoPower=1, ImpulseInitiate=2, Impulse=3, JumpInitiate=4, Jump=5}; + enum Event {Normal=0, NoPower=1, ImpulseInitiate=2, Impulse=3, JumpInitiate=4, Jump=5, Docked=6}; /// create a new entity and add it to the registry Entity(unsigned int flags = 0); |