From 0f3411f8fa34b9b6ca0d8fa1acf57645777fad1f Mon Sep 17 00:00:00 2001 From: Ryozuki Date: Fri, 19 Apr 2019 11:46:54 +0200 Subject: [PATCH] fix wording --- datasrc/network.py | 2 +- src/game/client/gameclient.cpp | 2 +- src/game/server/entities/character.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datasrc/network.py b/datasrc/network.py index 12d4faa6c..b618bf931 100644 --- a/datasrc/network.py +++ b/datasrc/network.py @@ -7,7 +7,7 @@ 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", "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"] diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 4cedb2f08..518208104 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -1159,7 +1159,7 @@ void CGameClient::OnNewSnapshot() pCharacterData->m_Flags & CHARACTERFLAG_TELEGUN_LASER; // 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) { diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index c4da0090c..6b6df79ed 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -1195,7 +1195,7 @@ void CCharacter::Snap(int SnappingClient) if(m_Hit&DISABLE_HIT_SHOTGUN) pDDNetCharacter->m_Flags |= CHARACTERFLAG_DISABLE_HIT_SHOTGUN; if(IsPaused()) - pDDNetCharacter->m_Flags |= CHARACTERFLAG_IS_SPECTATING; + pDDNetCharacter->m_Flags |= CHARACTERFLAG_SPECTATING; if(m_HasTeleGun) pDDNetCharacter->m_Flags |= CHARACTERFLAG_TELEGUN_GUN; if(m_HasTeleGrenade)