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

fix wording

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

2
datasrc/network.py
View file

@ -7,7 +7,7 @@ GameStateFlags = ["GAMEOVER", "SUDDENDEATH", "PAUSED", "RACETIME"]
CharacterFlags = ["SOLO", "JETPACK", "NO_COLLISION", "ENDLESS_HOOK", "ENDLESS_JUMP", "SUPER", CharacterFlags = ["SOLO", "JETPACK", "NO_COLLISION", "ENDLESS_HOOK", "ENDLESS_JUMP", "SUPER",
"DISABLE_HIT_HAMMER", "DISABLE_HIT_SHOTGUN", "DISABLE_HIT_GRENADE", "DISABLE_HIT_RIFLE", "DISABLE_HOOK", "DISABLE_HIT_HAMMER", "DISABLE_HIT_SHOTGUN", "DISABLE_HIT_GRENADE", "DISABLE_HIT_RIFLE", "DISABLE_HOOK",
"TELEGUN_GUN", "TELEGUN_GRENADE", "TELEGUN_LASER", "TELEGUN_GUN", "TELEGUN_GRENADE", "TELEGUN_LASER",
"FROZEN", "DEEP_FROZEN", "IS_SPECTATING"] "FROZEN", "DEEP_FROZEN", "SPECTATING"]
Emoticons = ["OOP", "EXCLAMATION", "HEARTS", "DROP", "DOTDOT", "MUSIC", "SORRY", "GHOST", "SUSHI", "SPLATTEE", "DEVILTEE", "ZOMG", "ZZZ", "WTF", "EYES", "QUESTION"] Emoticons = ["OOP", "EXCLAMATION", "HEARTS", "DROP", "DOTDOT", "MUSIC", "SORRY", "GHOST", "SUSHI", "SPLATTEE", "DEVILTEE", "ZOMG", "ZZZ", "WTF", "EYES", "QUESTION"]

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

@ -1159,7 +1159,7 @@ void CGameClient::OnNewSnapshot()
pCharacterData->m_Flags & CHARACTERFLAG_TELEGUN_LASER; pCharacterData->m_Flags & CHARACTERFLAG_TELEGUN_LASER;
// Other // Other
m_aClients[Item.m_ID].m_Spectating = pCharacterData->m_Flags & CHARACTERFLAG_IS_SPECTATING; m_aClients[Item.m_ID].m_Spectating = pCharacterData->m_Flags & CHARACTERFLAG_SPECTATING;
} }
else if(Item.m_Type == NETOBJTYPE_SPECTATORINFO) else if(Item.m_Type == NETOBJTYPE_SPECTATORINFO)
{ {

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

@ -1195,7 +1195,7 @@ void CCharacter::Snap(int SnappingClient)
if(m_Hit&DISABLE_HIT_SHOTGUN) if(m_Hit&DISABLE_HIT_SHOTGUN)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_SHOTGUN; pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_SHOTGUN;
if(IsPaused()) if(IsPaused())
pDDNetCharacter->m_Flags |= CHARACTERFLAG_IS_SPECTATING; pDDNetCharacter->m_Flags |= CHARACTERFLAG_SPECTATING;
if(m_HasTeleGun) if(m_HasTeleGun)
pDDNetCharacter->m_Flags |= CHARACTERFLAG_TELEGUN_GUN; pDDNetCharacter->m_Flags |= CHARACTERFLAG_TELEGUN_GUN;
if(m_HasTeleGrenade) if(m_HasTeleGrenade)