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

Add F-DDrace entities

Browse source
This commit is contained in:
fokkonaut 2020-12-21 16:45:19 +01:00
parent 8d4e1a8b1a
commit d4c4031f20
7 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -1025,6 +1025,7 @@ set(EXPECTED_DATA
editor/entities_clear/blockworlds.png
editor/entities_clear/ddnet.png
editor/entities_clear/ddrace.png
editor/entities_clear/f-ddrace.png
editor/entities_clear/fng.png
editor/entities_clear/race.png
editor/entities_clear/vanilla.png

BIN
data/editor/entities_clear/f-ddrace.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 415 KiB

4
datasrc/network.py
View file

@ -21,7 +21,7 @@ GameInfoFlags = [
# Full, use GameInfoFlags2 for more flags
]
GameInfoFlags2 = [
"ALLOW_X_SKINS", "GAMETYPE_CITY",
"ALLOW_X_SKINS", "GAMETYPE_CITY", "GAMETYPE_FDDRACE", "ENTITIES_FDDRACE",
]
ExPlayerFlags = ["AFK", "PAUSED", "SPEC"]
@ -56,7 +56,7 @@ enum
enum
{
GAMEINFO_CURVERSION=5,
GAMEINFO_CURVERSION=6,
};
'''

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

@ -155,7 +155,9 @@ IGraphics::CTextureHandle CMapImages::GetEntities(EMapImageEntityLayerType Entit
EMapImageModType EntitiesModType = MAP_IMAGE_MOD_TYPE_DDNET;
bool EntitesAreMasked = !GameClient()->m_GameInfo.m_DontMaskEntities;
if(GameClient()->m_GameInfo.m_EntitiesDDNet)
if(GameClient()->m_GameInfo.m_EntitiesFDDrace)
EntitiesModType = MAP_IMAGE_MOD_TYPE_FDDRACE;
else if(GameClient()->m_GameInfo.m_EntitiesDDNet)
EntitiesModType = MAP_IMAGE_MOD_TYPE_DDNET;
else if(GameClient()->m_GameInfo.m_EntitiesDDRace)
EntitiesModType = MAP_IMAGE_MOD_TYPE_DDRACE;

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

@ -24,6 +24,7 @@ enum EMapImageModType
MAP_IMAGE_MOD_TYPE_BLOCKWORLDS,
MAP_IMAGE_MOD_TYPE_FNG,
MAP_IMAGE_MOD_TYPE_VANILLA,
MAP_IMAGE_MOD_TYPE_FDDRACE,
MAP_IMAGE_MOD_TYPE_COUNT,
};
@ -34,7 +35,8 @@ static const char *const gs_aModEntitiesNames[] = {
"race",
"blockworlds",
"fng",
"vanilla"};
"vanilla",
"f-ddrace"};
class CMapImages : public CComponent
{

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

@ -1053,6 +1053,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
bool City;
bool Vanilla;
bool Plus;
bool FDDrace;
if(Version < 1)
{
Race = IsRace(pFallbackServerInfo);
@ -1064,6 +1065,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
City = IsCity(pFallbackServerInfo);
Vanilla = IsVanilla(pFallbackServerInfo);
Plus = IsPlus(pFallbackServerInfo);
FDDrace = false;
}
else
{
@ -1076,9 +1078,10 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
Vanilla = Flags & GAMEINFOFLAG_GAMETYPE_VANILLA;
Plus = Flags & GAMEINFOFLAG_GAMETYPE_PLUS;
City = Version >= 5 && Flags2 & GAMEINFOFLAG2_GAMETYPE_CITY;
FDDrace = Version >= 6 && Flags2 & GAMEINFOFLAG2_GAMETYPE_FDDRACE;
// Ensure invariants upheld by the server info parsing business.
DDRace = DDRace || DDNet;
DDRace = DDRace || DDNet || FDDrace;
Race = Race || FastCap || DDRace;
}
@ -1108,6 +1111,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
Info.m_Race = Race;
Info.m_DontMaskEntities = !DDNet;
Info.m_AllowXSkins = false;
Info.m_EntitiesFDDrace = FDDrace;
if(Version >= 0)
{
@ -1149,6 +1153,10 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
{
Info.m_AllowXSkins = Flags2 & GAMEINFOFLAG2_ALLOW_X_SKINS;
}
if(Version >= 6)
{
Info.m_EntitiesFDDrace = Flags2 & GAMEINFOFLAG2_ENTITIES_FDDRACE;
}
return Info;
}

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

@ -49,6 +49,7 @@ public:
bool m_EntitiesFNG;
bool m_EntitiesVanilla;
bool m_EntitiesBW;
bool m_EntitiesFDDrace;
bool m_Race;