edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed greande 6dmg thing

Browse source
This commit is contained in:
Magnus Auvinen 2008-04-03 07:17:22 +00:00
parent 75273485c4
commit 6f636b67d5
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/server/gs_server.cpp
View file

@ -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);