diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-20 23:00:46 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-20 23:00:46 +0000 |
| commit | ac1aeab149f704ab1b297be9c7662c5705e5e40d (patch) | |
| tree | 2c5fe9dcfe06c648ea2e1d8e87b638a76aeb1813 /src/game/server/entities/projectile.hpp | |
| parent | 9f7a6a04b0862737ca4566fb443140025505a522 (diff) | |
| download | zcatch-ac1aeab149f704ab1b297be9c7662c5705e5e40d.tar.gz zcatch-ac1aeab149f704ab1b297be9c7662c5705e5e40d.zip | |
fixed incorrect handling of projectiel and laser owner
Diffstat (limited to 'src/game/server/entities/projectile.hpp')
| -rw-r--r-- | src/game/server/entities/projectile.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/server/entities/projectile.hpp b/src/game/server/entities/projectile.hpp index c1370af1..a5c3b88f 100644 --- a/src/game/server/entities/projectile.hpp +++ b/src/game/server/entities/projectile.hpp @@ -12,7 +12,6 @@ public: }; vec2 direction; - ENTITY *powner; // this is nasty, could be removed when client quits int lifespan; int owner; int type; @@ -24,7 +23,7 @@ public: float force; int start_tick; - PROJECTILE(int type, int owner, vec2 pos, vec2 vel, int span, ENTITY* powner, + PROJECTILE(int type, int owner, vec2 pos, vec2 vel, int span, int damage, int flags, float force, int sound_impact, int weapon); vec2 get_pos(float time); |