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

Add flag to ddnetlaser for enabling prediction, let server control starttick

Browse source
This commit is contained in:
trml 2023-09-19 23:22:15 +02:00
parent 6a4318bf1a
commit b62754915a
11 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
datasrc/network.py
View file

@ -36,6 +36,9 @@ LegacyProjectileFlags = [f"CLIENTID_BIT{i}" for i in range(8)] + [
ProjectileFlags = [
"BOUNCE_HORIZONTAL", "BOUNCE_VERTICAL", "EXPLOSIVE", "FREEZE", "NORMALIZE_VEL",
]
LaserFlags = [
"NO_PREDICT",
]
LaserTypes = ["RIFLE", "SHOTGUN", "DOOR", "FREEZE", "DRAGGER", "GUN", "PLASMA"]
DraggerTypes = ["WEAK", "WEAK_NW", "NORMAL", "NORMAL_NW", "STRONG", "STRONG_NW"]
@ -100,6 +103,7 @@ Flags = [
Flags("EXPLAYERFLAG", ExPlayerFlags),
Flags("LEGACYPROJECTILEFLAG", LegacyProjectileFlags),
Flags("PROJECTILEFLAG", ProjectileFlags),
Flags("LASERFLAG", LaserFlags),
]
Objects = [
@ -294,6 +298,7 @@ Objects = [
NetIntAny("m_Type"),
NetIntAny("m_SwitchNumber", -1),
NetIntAny("m_Subtype", -1),
NetIntAny("m_Flags", 0),
]),
NetObjectEx("DDNetProjectile", "ddnet-projectile@netobj.ddnet.tw", [

38
src/game/client/components/items.cpp
View file

@ -472,38 +472,46 @@ void CItems::OnRender()
CLaserData Data = ExtractLaserInfo(Item.m_Type, pData, &GameClient()->m_GameWorld, pEntEx);
bool Inactive = !IsSuper && Data.m_SwitchNumber > 0 && Data.m_SwitchNumber < (int)aSwitchers.size() && !aSwitchers[Data.m_SwitchNumber].m_aStatus[SwitcherTeam];
bool IsEntBlink = false;
int EntStartTick = -1;
if(Data.m_Type == LASERTYPE_FREEZE)
{
if(Inactive && BlinkingLight)
continue;
Data.m_StartTick = DraggerStartTick;
IsEntBlink = BlinkingLight;
EntStartTick = DraggerStartTick;
}
else if(Data.m_Type == LASERTYPE_GUN)
{
if(Inactive && BlinkingGun)
continue;
Data.m_StartTick = GunStartTick;
IsEntBlink = BlinkingGun;
EntStartTick = GunStartTick;
}
else if(Data.m_Type == LASERTYPE_DRAGGER)
{
if(Inactive && BlinkingDragger)
continue;
Data.m_StartTick = DraggerStartTick;
IsEntBlink = BlinkingDragger;
EntStartTick = DraggerStartTick;
}
else if(Data.m_Type == LASERTYPE_DOOR)
{
if(Inactive || IsSuper)
if(Data.m_Predict && (Inactive || IsSuper))
{
Data.m_From.x = Data.m_To.x;
Data.m_From.y = Data.m_To.y;
}
Data.m_StartTick = Client()->GameTick(g_Config.m_ClDummy);
EntStartTick = Client()->GameTick(g_Config.m_ClDummy);
}
else if(Data.m_Type >= NUM_LASERTYPES)
else
{
if(Inactive && BlinkingDragger)
continue;
Data.m_StartTick = Client()->GameTick(g_Config.m_ClDummy);
IsEntBlink = BlinkingDragger;
EntStartTick = Client()->GameTick(g_Config.m_ClDummy);
}
if(Data.m_Predict && Inactive && IsEntBlink)
{
continue;
}
if(Data.m_StartTick <= 0 && EntStartTick != -1)
{
Data.m_StartTick = EntStartTick;
}
RenderLaser(&Data);

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

@ -32,6 +32,7 @@ CLaserData ExtractLaserInfo(int NetObjType, const void *pData, CGameWorld *pGame
Result.m_SwitchNumber = 0;
Result.m_Subtype = -1;
Result.m_TuneZone = pGameWorld && pGameWorld->m_WorldConfig.m_UseTuneZones ? pGameWorld->Collision()->IsTune(pGameWorld->Collision()->GetMapIndex(Result.m_From)) : 0;
Result.m_Predict = true;
}
if(pEntEx && !(NetObjType == NETOBJTYPE_DDNETLASER && Result.m_SwitchNumber >= 0))
@ -72,5 +73,6 @@ CLaserData ExtractLaserInfoDDNet(const CNetObj_DDNetLaser *pLaser, CGameWorld *p
Result.m_SwitchNumber = pLaser->m_SwitchNumber;
Result.m_Subtype = pLaser->m_Subtype;
Result.m_TuneZone = pGameWorld && pGameWorld->m_WorldConfig.m_UseTuneZones ? pGameWorld->Collision()->IsTune(pGameWorld->Collision()->GetMapIndex(Result.m_From)) : 0;
Result.m_Predict = !(pLaser->m_Flags & LASERFLAG_NO_PREDICT);
return Result;
}

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

@ -21,6 +21,7 @@ public:
int m_Type;
int m_SwitchNumber;
int m_Subtype;
bool m_Predict;
// TuneZone is introduced locally
int m_TuneZone;
};

4
src/game/client/prediction/gameworld.cpp
View file

@ -492,8 +492,10 @@ void CGameWorld::NetObjAdd(int ObjID, int ObjType, const void *pObjData, const C
else if((ObjType == NETOBJTYPE_LASER || ObjType == NETOBJTYPE_DDNETLASER) && m_WorldConfig.m_PredictWeapons)
{
CLaserData Data = ExtractLaserInfo(ObjType, pObjData, this, pDataEx);
if(!IsLocalTeam(Data.m_Owner))
if(!IsLocalTeam(Data.m_Owner) || !Data.m_Predict)
{
return;
}
if(Data.m_Type == LASERTYPE_RIFLE || Data.m_Type == LASERTYPE_SHOTGUN || Data.m_Type < 0)
{

2
src/game/server/entities/door.cpp
View file

@ -58,7 +58,7 @@ void CDoor::Snap(int SnappingClient)
if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
{
From = m_To;
StartTick = 0;
StartTick = -1;
}
else
{

2
src/game/server/entities/dragger.cpp
View file

@ -212,7 +212,7 @@ void CDragger::Snap(int SnappingClient)
int StartTick;
if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
{
StartTick = 0;
StartTick = -1;
}
else
{

7
src/game/server/entities/dragger_beam.cpp
View file

@ -121,13 +121,18 @@ void CDraggerBeam::Snap(int SnappingClient)
StartTick = Server()->Tick();
}
int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
{
StartTick = -1;
}
int SnapObjID = GetID();
if(m_pDragger->WillDraggerBeamUseDraggerID(m_ForClientID, SnappingClient))
{
SnapObjID = m_pDragger->GetID();
}
int SnappingClientVersion = GameServer()->GetClientVersion(SnappingClient);
GameServer()->SnapLaserObject(CSnapContext(SnappingClientVersion), SnapObjID,
TargetPos, m_Pos, StartTick, m_ForClientID, LASERTYPE_DRAGGER, Subtype, m_Number);
}

2
src/game/server/entities/gun.cpp
View file

@ -154,7 +154,7 @@ void CGun::Snap(int SnappingClient)
int StartTick;
if(SnappingClientVersion >= VERSION_DDNET_ENTITY_NETOBJS)
{
StartTick = 0;
StartTick = -1;
}
else
{

2
src/game/server/entities/light.cpp
View file

@ -112,7 +112,7 @@ void CLight::Snap(int SnappingClient)
pChr = GameServer()->GetPlayerChar(GameServer()->m_apPlayers[SnappingClient]->m_SpectatorID);
vec2 From = m_Pos;
int StartTick = 0;
int StartTick = -1;
if(pChr && pChr->Team() == TEAM_SUPER)
{

1
src/game/server/gamecontext.cpp
View file

@ -396,6 +396,7 @@ bool CGameContext::SnapLaserObject(const CSnapContext &Context, int SnapID, cons
pObj->m_Type = LaserType;
pObj->m_Subtype = Subtype;
pObj->m_SwitchNumber = SwitchNumber;
pObj->m_Flags = 0;
}
else
{