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

add m_IsSolo and fix hook col

Browse source
This commit is contained in:
Ryozuki 2019-04-07 18:58:49 +02:00
parent ea82402e7e
commit 813c24bf29
No known key found for this signature in database
GPG key ID: 848FCC08E5B89681
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
datasrc/network.py
View file

@ -161,6 +161,7 @@ Objects = [
NetIntRange("m_Weapon", 0, 'NUM_WEAPONS-1'),
NetIntRange("m_Emote", 0, len(Emotes)),
NetIntRange("m_AttackTick", 0, 'max_int'),
NetBool("m_IsSolo")
]),
NetObject("PlayerInfo", [

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

@ -2000,7 +2000,7 @@ int CGameClient::IntersectCharacter(vec2 HookPos, vec2 NewPos, vec2& NewPos2, in
vec2 Position = mix(vec2(Prev.m_X, Prev.m_Y), vec2(Player.m_X, Player.m_Y), Client()->IntraGameTick());
if(!cData.m_Active || i == ownID || !m_Teams.SameTeam(i, ownID))
if(!cData.m_Active || i == ownID || !m_Teams.SameTeam(i, ownID) || Player.m_IsSolo)
continue;
vec2 ClosestPoint = closest_point_on_line(HookPos, NewPos, Position);

2
src/game/server/entities/character.cpp
View file

@ -1163,6 +1163,8 @@ void CCharacter::Snap(int SnappingClient)
}
pCharacter->m_PlayerFlags = GetPlayer()->m_PlayerFlags;
pCharacter->m_IsSolo = Teams()->m_Core.GetSolo(m_pPlayer->GetCID());
}
int CCharacter::NetworkClipped(int SnappingClient)