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

Merge #1842

Browse source 
1842: [WIP] Fix timer r=heinrich5991 a=Learath2

I'm really unsure about this one.

DEPENDS on #1839 

Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2019-07-19 22:23:22 +00:00
parent 628f673014 b1ed78d58d
commit cd8994147c
5 changed files with 9 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", "BUG_DDRACE_INPUT", "BUG_FNG_LASER_RANGE", "BUG_VANILLA_BOUNCE",
"PREDICT_FNG", "PREDICT_DDRACE", "PREDICT_DDRACE_TILES", "PREDICT_VANILLA", "PREDICT_FNG", "PREDICT_DDRACE", "PREDICT_DDRACE_TILES", "PREDICT_VANILLA",
"ENTITIES_DDNET", "ENTITIES_DDRACE", "ENTITIES_RACE", "ENTITIES_FNG", "ENTITIES_DDNET", "ENTITIES_DDRACE", "ENTITIES_RACE", "ENTITIES_FNG",
"ENTITIES_VANILLA", "ENTITIES_VANILLA", "RACE_SHOW_RECORD",
] ]
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/components/hud.cpp
View file

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

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

@ -1007,8 +1007,8 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
Info.m_FlagStartsRace = FastCap; Info.m_FlagStartsRace = FastCap;
Info.m_TimeScore = Race; Info.m_TimeScore = Race;
Info.m_UnlimitedAmmo = Race; Info.m_UnlimitedAmmo = Race;
Info.m_DDRaceRecordMessage = DDRace; Info.m_DDRaceRecordMessage = DDRace && !DDNet;
Info.m_RaceRecordMessage = Race && !DDRace; Info.m_RaceRecordMessage = DDNet || (Race && !DDRace);
Info.m_AllowEyeWheel = DDRace || BlockWorlds || Plus; Info.m_AllowEyeWheel = DDRace || BlockWorlds || Plus;
Info.m_AllowHookColl = DDRace; Info.m_AllowHookColl = DDRace;
Info.m_AllowZoom = Race || BlockWorlds; Info.m_AllowZoom = Race || BlockWorlds;
@ -1025,7 +1025,8 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
Info.m_EntitiesRace = Race; Info.m_EntitiesRace = Race;
Info.m_EntitiesFNG = FNG; Info.m_EntitiesFNG = FNG;
Info.m_EntitiesVanilla = Vanilla; Info.m_EntitiesVanilla = Vanilla;
Info.m_Race = Race || DDRace; Info.m_Race = Race;
Info.m_RaceShowRecord = Race && !DDRace;
if(Version >= 0) if(Version >= 0)
{ {
@ -1057,6 +1058,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
if(Version >= 3) if(Version >= 3)
{ {
Info.m_Race = Flags&GAMEINFOFLAG_RACE; Info.m_Race = Flags&GAMEINFOFLAG_RACE;
Info.m_RaceShowRecord = Flags&GAMEINFOFLAG_RACE_SHOW_RECORD;
} }
return Info; return Info;
} }

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

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

2
src/game/server/gamecontroller.cpp
View file

@ -545,7 +545,7 @@ void IGameController::Snap(int SnappingClient)
| GAMEINFOFLAG_GAMETYPE_DDRACE | GAMEINFOFLAG_GAMETYPE_DDRACE
| GAMEINFOFLAG_GAMETYPE_DDNET | GAMEINFOFLAG_GAMETYPE_DDNET
| GAMEINFOFLAG_UNLIMITED_AMMO | GAMEINFOFLAG_UNLIMITED_AMMO
| GAMEINFOFLAG_DDRACE_RECORD_MESSAGE | GAMEINFOFLAG_RACE_RECORD_MESSAGE
| GAMEINFOFLAG_ALLOW_EYE_WHEEL | GAMEINFOFLAG_ALLOW_EYE_WHEEL
| GAMEINFOFLAG_ALLOW_HOOK_COLL | GAMEINFOFLAG_ALLOW_HOOK_COLL
| GAMEINFOFLAG_ALLOW_ZOOM | GAMEINFOFLAG_ALLOW_ZOOM