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

applied patch for hook bug

Browse source
This commit is contained in:
Magnus Auvinen 2009-01-09 22:41:26 +00:00
parent c3b6b87b5a
commit 1f2ffb0ffe
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/gamecore.cpp
View file

@ -314,6 +314,7 @@ void CHARACTER_CORE::tick(bool use_input)
// Check against other players first // Check against other players first
if(world) if(world)
{ {
float dist = 0.0f;
for(int i = 0; i < MAX_CLIENTS; i++) for(int i = 0; i < MAX_CLIENTS; i++)
{ {
CHARACTER_CORE *p = world->characters[i]; CHARACTER_CORE *p = world->characters[i];
@ -323,10 +324,13 @@ void CHARACTER_CORE::tick(bool use_input)
vec2 closest_point = closest_point_on_line(hook_pos, new_pos, p->pos); vec2 closest_point = closest_point_on_line(hook_pos, new_pos, p->pos);
if(distance(p->pos, closest_point) < phys_size+2.0f) if(distance(p->pos, closest_point) < phys_size+2.0f)
{ {
triggered_events |= COREEVENT_HOOK_ATTACH_PLAYER; if (hooked_player == -1 || distance (hook_pos, p->pos) < dist)
hook_state = HOOK_GRABBED; {
hooked_player = i; triggered_events |= COREEVENT_HOOK_ATTACH_PLAYER;
break; hook_state = HOOK_GRABBED;
hooked_player = i;
dist = distance (hook_pos, p->pos);
}
} }
} }
} }