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

fix hook col and make it green on tees

Browse source
This commit is contained in:
Ryozuki 2019-06-09 19:26:20 +02:00
parent d482edc7d3
commit c089cffdde
No known key found for this signature in database
GPG key ID: 848FCC08E5B89681
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/players.cpp
View file

@ -339,7 +339,7 @@ void CPlayers::RenderPlayer(
if(m_pClient->IntersectCharacter(OldPos, FinishPos, FinishPos, ClientID) != -1)
{
Graphics()->SetColor(1.0f, 1.0f, 0.0f, Alpha);
Graphics()->SetColor(0.0f, 1.0f, 0.0f, Alpha);
break;
}

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