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

Merge #1779

Browse source 
1779: Fix hook col r=def- a=Ryozuki

Fixes #1758

- Made a rly small optimization.
- Fixed the bug from the issue.

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
This commit is contained in:
bors[bot] 2019-06-10 08:11:40 +00:00
parent d482edc7d3 916eab68fe
commit ba2814de20
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/game/client/gameclient.cpp
View file

@ -1821,23 +1821,27 @@ int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2& NewPos2, in
float Distance = 0.0f;
int ClosestID = -1;
CClientData OwncData = m_aClients[ownID];
if(!OwncData.m_Super && !m_Tuning[g_Config.m_ClDummy].m_PlayerHooking)
return ClosestID;
CClientData OwnClientData = m_aClients[ownID];
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(i == ownID)
continue;
CClientData cData = m_aClients[i];
if(!cData.m_Active)
continue;
CNetObj_Character Prev = m_Snap.m_aCharacters[i].m_Prev;
CNetObj_Character Player = m_Snap.m_aCharacters[i].m_Cur;
vec2 Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), Client()->IntraGameTick());
bool IsOneSuper = cData.m_Super || OwncData.m_Super;
bool IsOneSolo = cData.m_Solo || OwncData.m_Solo;
bool IsOneSuper = cData.m_Super || OwnClientData.m_Super;
bool IsOneSolo = cData.m_Solo || OwnClientData.m_Solo;
if(!cData.m_Active || i == ownID || (!IsOneSuper && (!m_Teams.SameTeam(i, ownID) || IsOneSolo || OwncData.m_NoHookHit)))
if(!IsOneSuper && (!m_Teams.SameTeam(i, ownID) || IsOneSolo || OwnClientData.m_NoHookHit))
continue;
vec2 ClosestPoint = closest_point_on_line(HookPos, NewPos, Position);