diff options
Diffstat (limited to 'src/game/server/entities/projectile.cpp')
| -rw-r--r-- | src/game/server/entities/projectile.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp index cd15ba10..e0b4701a 100644 --- a/src/game/server/entities/projectile.cpp +++ b/src/game/server/entities/projectile.cpp @@ -7,7 +7,7 @@ ////////////////////////////////////////////////// // projectile ////////////////////////////////////////////////// -PROJECTILE::PROJECTILE(int type, int owner, vec2 pos, vec2 dir, int span, ENTITY* powner, +PROJECTILE::PROJECTILE(int type, int owner, vec2 pos, vec2 dir, int span, int damage, int flags, float force, int sound_impact, int weapon) : ENTITY(NETOBJTYPE_PROJECTILE) { @@ -16,7 +16,6 @@ PROJECTILE::PROJECTILE(int type, int owner, vec2 pos, vec2 dir, int span, ENTITY this->direction = dir; this->lifespan = span; this->owner = owner; - this->powner = powner; this->flags = flags; this->force = force; this->damage = damage; @@ -68,8 +67,8 @@ void PROJECTILE::tick() int collide = col_intersect_line(prevpos, curpos, &curpos); //int collide = col_check_point((int)curpos.x, (int)curpos.y); - - CHARACTER *targetchr = game.world.intersect_character(prevpos, curpos, 6.0f, curpos, powner); + CHARACTER *ownerchar = game.get_player_char(owner); + CHARACTER *targetchr = game.world.intersect_character(prevpos, curpos, 6.0f, curpos, ownerchar); if(targetchr || collide || lifespan < 0) { if(lifespan >= 0 || weapon == WEAPON_GRENADE) |