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

Merge #1849

Browse source 
1849: Remove unused branch/flag r=def- a=Learath2

I've dug through a lot of servers, couldn't really find any that send their time in a way that would take that branch.

Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2019-07-22 15:31:11 +00:00
parent 658efe776b 5ddc140494
commit 102ddc4d49
4 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datasrc/network.py
View file

@ -17,7 +17,7 @@ GameInfoFlags = [
"BUG_DDRACE_INPUT", "BUG_FNG_LASER_RANGE", "BUG_VANILLA_BOUNCE",
"PREDICT_FNG", "PREDICT_DDRACE", "PREDICT_DDRACE_TILES", "PREDICT_VANILLA",
"ENTITIES_DDNET", "ENTITIES_DDRACE", "ENTITIES_RACE", "ENTITIES_FNG",
"ENTITIES_VANILLA", "RACE_SHOW_RECORD",
"ENTITIES_VANILLA",
]
Emoticons = ["OOP", "EXCLAMATION", "HEARTS", "DROP", "DOTDOT", "MUSIC", "SORRY", "GHOST", "SUSHI", "SPLATTEE", "DEVILTEE", "ZOMG", "ZZZ", "WTF", "EYES", "QUESTION"]

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

@ -126,8 +126,6 @@ void CHud::RenderGameTimer()
str_format(aBuf, sizeof(aBuf), "00:00.0");
else if(Time <= 0)
str_format(aBuf, sizeof(aBuf), "00:00");
else if(GameClient()->m_GameInfo.m_RaceShowRecord && GameClient()->m_GameInfo.m_RaceRecordMessage && m_ServerRecord >= 0)
str_format(aBuf, sizeof(aBuf), "%02d:%02d", (int)(m_ServerRecord*100)/60, ((int)(m_ServerRecord*100)%60));
else if(g_Config.m_ClShowDecisecs)
str_format(aBuf, sizeof(aBuf), "%02d:%02d.%d", Time/60, Time%60, m_DDRaceTick/10);
else

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

@ -1026,7 +1026,6 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
Info.m_EntitiesFNG = FNG;
Info.m_EntitiesVanilla = Vanilla;
Info.m_Race = Race;
Info.m_RaceShowRecord = Race && !DDRace;
if(Version >= 0)
{
@ -1058,7 +1057,6 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
if(Version >= 3)
{
Info.m_Race = Flags&GAMEINFOFLAG_RACE;
Info.m_RaceShowRecord = Flags&GAMEINFOFLAG_RACE_SHOW_RECORD;
}
return Info;
}

1
src/game/client/gameclient.h
View file

@ -89,7 +89,6 @@ public:
bool m_EntitiesVanilla;
bool m_Race;
bool m_RaceShowRecord;
};
class CGameClient : public IGameClient