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

fix wording and add/fix no col and no hook

Browse source
This commit is contained in:
Ryozuki 2019-04-19 11:59:09 +02:00
parent 0f3411f8fa
commit eaef31d4a0
No known key found for this signature in database
GPG key ID: 848FCC08E5B89681
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datasrc/network.py
View file

@ -5,7 +5,7 @@ PlayerFlags = ["PLAYING", "IN_MENU", "CHATTING", "SCOREBOARD", "AIM"]
GameFlags = ["TEAMS", "FLAGS"]
GameStateFlags = ["GAMEOVER", "SUDDENDEATH", "PAUSED", "RACETIME"]
CharacterFlags = ["SOLO", "JETPACK", "NO_COLLISION", "ENDLESS_HOOK", "ENDLESS_JUMP", "SUPER",
"DISABLE_HIT_HAMMER", "DISABLE_HIT_SHOTGUN", "DISABLE_HIT_GRENADE", "DISABLE_HIT_RIFLE", "DISABLE_HOOK",
"NO_HAMMER_HIT", "NO_SHOTGUN_HIT", "NO_GRENADE_HIT", "NO_RIFLE_HIT", "NO_HOOK",
"TELEGUN_GUN", "TELEGUN_GRENADE", "TELEGUN_LASER",
"FROZEN", "DEEP_FROZEN", "SPECTATING"]

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

@ -1126,15 +1126,15 @@ void CGameClient::OnNewSnapshot()
m_aClients[Item.m_ID].m_NoCollision = m_aClients[Item.m_ID].m_Predicted.m_NoCollision =
pCharacterData->m_Flags & CHARACTERFLAG_NO_COLLISION;
m_aClients[Item.m_ID].m_NoHammerHit = m_aClients[Item.m_ID].m_Predicted.m_NoHammerHit =
pCharacterData->m_Flags & CHARACTERFLAG_DISABLE_HIT_HAMMER;
pCharacterData->m_Flags & CHARACTERFLAG_NO_HAMMER_HIT;
m_aClients[Item.m_ID].m_NoGrenadeHit = m_aClients[Item.m_ID].m_Predicted.m_NoGrenadeHit =
pCharacterData->m_Flags & CHARACTERFLAG_DISABLE_HIT_GRENADE;
pCharacterData->m_Flags & CHARACTERFLAG_NO_GRENADE_HIT;
m_aClients[Item.m_ID].m_NoRifleHit = m_aClients[Item.m_ID].m_Predicted.m_NoRifleHit =
pCharacterData->m_Flags & CHARACTERFLAG_DISABLE_HIT_RIFLE;
pCharacterData->m_Flags & CHARACTERFLAG_NO_RIFLE_HIT;
m_aClients[Item.m_ID].m_NoShotgunHit = m_aClients[Item.m_ID].m_Predicted.m_NoShotgunHit =
pCharacterData->m_Flags & CHARACTERFLAG_DISABLE_HIT_SHOTGUN;
pCharacterData->m_Flags & CHARACTERFLAG_NO_SHOTGUN_HIT;
m_aClients[Item.m_ID].m_NoHookHit = m_aClients[Item.m_ID].m_Predicted.m_NoHookHit =
pCharacterData->m_Flags & CHARACTERFLAG_DISABLE_HOOK;
pCharacterData->m_Flags & CHARACTERFLAG_NO_HOOK;
m_aClients[Item.m_ID].m_Super = m_aClients[Item.m_ID].m_Predicted.m_Super =
pCharacterData->m_Flags & CHARACTERFLAG_SUPER;

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

@ -1178,6 +1178,10 @@ void CCharacter::Snap(int SnappingClient)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_SUPER;
if(m_EndlessHook)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_ENDLESS_HOOK;
if(!m_Core.m_Collision)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_COLLISION;
if(!m_Core.m_Hook)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_HOOK;
if(m_SuperJump)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_ENDLESS_JUMP;
if(m_Jetpack || m_NinjaJetpack)
@ -1187,13 +1191,13 @@ void CCharacter::Snap(int SnappingClient)
if(m_DeepFreeze)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_DEEP_FROZEN;
if(m_Hit&DISABLE_HIT_GRENADE)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_GRENADE;
pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_GRENADE_HIT;
if(m_Hit&DISABLE_HIT_HAMMER)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_HAMMER;
pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_HAMMER_HIT;
if(m_Hit&DISABLE_HIT_RIFLE)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_RIFLE;
pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_RIFLE_HIT;
if(m_Hit&DISABLE_HIT_SHOTGUN)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_SHOTGUN;
pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_SHOTGUN_HIT;
if(IsPaused())
pDDNetCharacter->m_Flags |= CHARACTERFLAG_SPECTATING;
if(m_HasTeleGun)