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

Changes

Browse source
This commit is contained in:
MikiGamer 2020-05-19 17:13:34 +02:00
parent 95c419d684
commit d5c5235c18
3 changed files with 8 additions and 4 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", "ENTITIES_BW", "DONT_MASK_ENTITIES",
"ENTITIES_VANILLA", "DONT_MASK_ENTITIES", "ENTITIES_BW",
]
ExPlayerFlags = ["AFK", "PAUSED", "SPEC"]

4
src/game/client/components/mapimages.cpp
View file

@ -104,12 +104,12 @@ IGraphics::CTextureHandle CMapImages::GetEntities()
pEntities = "ddrace";
else if(GameClient()->m_GameInfo.m_EntitiesRace)
pEntities = "race";
else if (GameClient()->m_GameInfo.m_EntitiesBW)
pEntities = "blockworlds";
else if(GameClient()->m_GameInfo.m_EntitiesFNG)
pEntities = "fng";
else if(GameClient()->m_GameInfo.m_EntitiesVanilla)
pEntities = "vanilla";
else if(GameClient()->m_GameInfo.m_EntitiesBW)
pEntities = "blockworlds";
if(!m_EntitiesIsLoaded || m_pEntitiesGameType != pEntities)
{

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

@ -1066,13 +1066,17 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
Info.m_EntitiesRace = Flags&GAMEINFOFLAG_ENTITIES_RACE;
Info.m_EntitiesFNG = Flags&GAMEINFOFLAG_ENTITIES_FNG;
Info.m_EntitiesVanilla = Flags&GAMEINFOFLAG_ENTITIES_VANILLA;
Info.m_EntitiesBW = Flags&GAMEINFOFLAG_ENTITIES_BW;
}
if(Version >= 3)
{
Info.m_Race = Flags&GAMEINFOFLAG_RACE;
Info.m_DontMaskEntities = Flags&GAMEINFOFLAG_DONT_MASK_ENTITIES;
}
if (Version >= 4)
{
Info.m_EntitiesBW = Flags&GAMEINFOFLAG_ENTITIES_BW;
}
return Info;
}