diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-04-03 07:17:22 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-04-03 07:17:22 +0000 |
| commit | 6f636b67d59e98f72b4ba9f08c1a68ae3bf7cef2 (patch) | |
| tree | abf183b50be50275a88432e289c98e3face6057c | |
| parent | 75273485c47247d13e5d533b19b65402db6d660c (diff) | |
| download | zcatch-6f636b67d59e98f72b4ba9f08c1a68ae3bf7cef2.tar.gz zcatch-6f636b67d59e98f72b4ba9f08c1a68ae3bf7cef2.zip | |
fixed greande 6dmg thing
| -rw-r--r-- | src/game/server/gs_server.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index bebce635..1857f42f 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -500,16 +500,14 @@ void projectile::tick() int collide = col_intersect_line(prevpos, curpos, &curpos); //int collide = col_check_point((int)curpos.x, (int)curpos.y); - vec2 new_pos; - entity *targetplayer = (entity*)intersect_player(prevpos, curpos, 6.0f, new_pos, powner); - + entity *targetplayer = (entity*)intersect_player(prevpos, curpos, 6.0f, curpos, powner); if(targetplayer || collide || lifespan < 0) { if (lifespan >= 0 || weapon == WEAPON_GRENADE) create_sound(curpos, sound_impact); if (flags & PROJECTILE_FLAGS_EXPLODE) - create_explosion(prevpos, owner, weapon, false); + create_explosion(curpos, owner, weapon, false); else if (targetplayer) { targetplayer->take_damage(direction * max(0.001f, force), damage, owner, weapon); |