TDM add snap and remove gameflag_flags

M0REKZ · Jul 29, 2024 · 6a76f96 · 6a76f96
1 parent 76f8e10
commit 6a76f96
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/game/server/gamemodes/dm.cpp b/src/game/server/gamemodes/dm.cpp
@@ -6,7 +6,7 @@
 CGameControllerDM::CGameControllerDM(class CGameContext *pGameServer) :
 	CGameControllerInstagib(pGameServer)
 {
-	m_GameFlags = GAMEFLAG_FLAGS;
+	m_GameFlags = 0;
 }
 
 CGameControllerDM::~CGameControllerDM() = default;

diff --git a/src/game/server/gamemodes/tdm.cpp b/src/game/server/gamemodes/tdm.cpp
@@ -6,7 +6,7 @@
 CGameControllerTDM::CGameControllerTDM(class CGameContext *pGameServer) :
 	CGameControllerDM(pGameServer)
 {
-	m_GameFlags = GAMEFLAG_TEAMS | GAMEFLAG_FLAGS;
+	m_GameFlags = GAMEFLAG_TEAMS;
 }
 
 CGameControllerTDM::~CGameControllerTDM() = default;
@@ -54,3 +54,18 @@ int CGameControllerTDM::OnCharacterDeath(class CCharacter *pVictim, class CPlaye
 	}
 	return false;
 }
+
+void CGameControllerTDM::Snap(int SnappingClient)
+{
+    IGameController::Snap(SnappingClient);
+
+    CNetObj_GameData *pGameDataObj = (CNetObj_GameData *)Server()->SnapNewItem(NETOBJTYPE_GAMEDATA, 0, sizeof(CNetObj_GameData));
+    if(!pGameDataObj)
+        return;
+
+    pGameDataObj->m_TeamscoreRed = m_aTeamscore[TEAM_RED];
+    pGameDataObj->m_TeamscoreBlue = m_aTeamscore[TEAM_BLUE];
+
+    pGameDataObj->m_FlagCarrierRed = 0;
+    pGameDataObj->m_FlagCarrierBlue = 0;
+}
diff --git a/src/game/server/gamemodes/tdm.h b/src/game/server/gamemodes/tdm.h
@@ -9,6 +9,7 @@ class CGameControllerTDM : public CGameControllerDM
 	CGameControllerTDM(class CGameContext *pGameServer);
 	~CGameControllerTDM();
 
+    virtual void Snap(int SnappingClient) override;
 	virtual int OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int Weapon) override;
 	void Tick() override;
 };