Merge pull request ddnet#8959 from Matodor/pr_character_tune_zone_override

edg-l · web-flow · commit 9e376be7e092 · 2025-01-27T08:15:49.000Z
Allow custom mods override client prediction tune zone (per-player)
diff --git a/datasrc/network.py b/datasrc/network.py
@@ -259,6 +259,7 @@
 		# New data fields for improved target accuracy
 		NetIntAny("m_TargetX", 0),
 		NetIntAny("m_TargetY", 0),
+		NetIntRange("m_TuneZoneOverride", -1, 'NUM_TUNEZONES-1', -1),
 	], validate_size=False),
 
 	NetObjectEx("DDNetPlayer", "player@netobj.ddnet.tw", [
diff --git a/src/engine/shared/protocol.h b/src/engine/shared/protocol.h
@@ -131,6 +131,11 @@ enum
 	VERSION_DDNET_RECONNECT = 18090,
 };
 
+enum
+{
+	NUM_TUNEZONES = 256,
+};
+
 typedef std::bitset<MAX_CLIENTS> CClientMask;
 
 #endif
diff --git a/src/game/client/components/debughud.cpp b/src/game/client/components/debughud.cpp
@@ -63,8 +63,8 @@ void CDebugHud::RenderNetCorrections()
 	str_format(aBuf, sizeof(aBuf), "%d", pCharacter == nullptr ? -1 : pCharacter->m_TeleCheckpoint);
 	RenderRow("Checkpoint:", aBuf);
 
-	str_format(aBuf, sizeof(aBuf), "%d", pCharacter == nullptr ? -1 : pCharacter->m_TuneZone);
-	RenderRow("Tune zone:", aBuf);
+	str_format(aBuf, sizeof(aBuf), "%d / %d", pCharacter == nullptr ? -1 : pCharacter->GetPureTuneZone(), pCharacter == nullptr ? -1 : pCharacter->GetOverriddenTuneZone());
+	RenderRow("Tune zone (pure / override):", aBuf);
 
 	str_format(aBuf, sizeof(aBuf), "%.2f", m_pClient->m_Snap.m_pLocalCharacter->m_X / 32.0f);
 	RenderRow("Pos.x:", aBuf);
@@ -96,7 +96,7 @@ void CDebugHud::RenderTuning()
 
 	const CTuningParams StandardTuning;
 	const CTuningParams *pGlobalTuning = m_pClient->GetTuning(0);
-	const CTuningParams *pZoneTuning = !m_pClient->m_GameWorld.m_WorldConfig.m_UseTuneZones || pCharacter == nullptr ? nullptr : m_pClient->GetTuning(pCharacter->m_TuneZone);
+	const CTuningParams *pZoneTuning = !m_pClient->m_GameWorld.m_WorldConfig.m_UseTuneZones || pCharacter == nullptr ? nullptr : m_pClient->GetTuning(pCharacter->GetOverriddenTuneZone());
 	const CTuningParams *pActiveTuning = pZoneTuning == nullptr ? pGlobalTuning : pZoneTuning;
 
 	const float Height = 300.0f;
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -2971,7 +2971,11 @@ void CGameClient::UpdatePrediction()
 
 	if(m_GameWorld.m_WorldConfig.m_UseTuneZones)
 	{
-		int TuneZone = Collision()->IsTune(Collision()->GetMapIndex(LocalCharPos));
+		int TuneZone =
+			m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_HasExtendedData &&
+					m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_ExtendedData.m_TuneZoneOverride != -1 ?
+				m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_ExtendedData.m_TuneZoneOverride :
+				Collision()->IsTune(Collision()->GetMapIndex(LocalCharPos));
 
 		if(TuneZone != m_aLocalTuneZone[g_Config.m_ClDummy])
 		{
diff --git a/src/game/client/gameclient.h b/src/game/client/gameclient.h
@@ -851,10 +851,6 @@ class CGameClient : public IGameClient
 	CCharOrder m_CharOrder;
 	int m_aSwitchStateTeam[NUM_DUMMIES];
 
-	enum
-	{
-		NUM_TUNEZONES = 256
-	};
 	void LoadMapSettings();
 	CTuningParams m_aTuningList[NUM_TUNEZONES];
 	CTuningParams *TuningList() { return m_aTuningList; }
diff --git a/src/game/client/prediction/entities/character.cpp b/src/game/client/prediction/entities/character.cpp
@@ -84,9 +84,8 @@ void CCharacter::HandleJetpack()
 	{
 		if(m_Core.m_Jetpack)
 		{
-			float Strength = GetTuning(m_TuneZone)->m_JetpackStrength;
-			if(!m_TuneZone)
-				Strength = m_LastJetpackStrength;
+			int TuneZone = GetOverriddenTuneZone();
+			float Strength = TuneZone ? GetTuning(TuneZone)->m_JetpackStrength : m_LastJetpackStrength;
 			TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, GetCid(), m_Core.m_ActiveWeapon);
 		}
 	}
@@ -130,7 +129,7 @@ void CCharacter::HandleNinja()
 		// Set velocity
 		m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * g_pData->m_Weapons.m_Ninja.m_Velocity;
 		vec2 OldPos = m_Pos;
-		Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(m_ProximityRadius, m_ProximityRadius), vec2(GetTuning(m_TuneZone)->m_GroundElasticityX, GetTuning(m_TuneZone)->m_GroundElasticityY));
+		Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(m_ProximityRadius, m_ProximityRadius), vec2(GetTuning(GetOverriddenTuneZone())->m_GroundElasticityX, GetTuning(GetOverriddenTuneZone())->m_GroundElasticityY));
 
 		// reset velocity so the client doesn't predict stuff
 		m_Core.m_Vel = vec2(0.f, 0.f);
@@ -323,7 +322,7 @@ void CCharacter::FireWeapon()
 			else
 				Dir = vec2(0.f, -1.f);
 
-			float Strength = GetTuning(m_TuneZone)->m_HammerStrength;
+			float Strength = GetTuning(GetOverriddenTuneZone())->m_HammerStrength;
 
 			vec2 Temp = pTarget->m_Core.m_Vel + normalize(Dir + vec2(0.f, -1.1f)) * 10.0f;
 			Temp = ClampVel(pTarget->m_MoveRestrictions, Temp);
@@ -357,7 +356,7 @@ void CCharacter::FireWeapon()
 		// if we Hit anything, we have to wait for the reload
 		if(Hits)
 		{
-			float FireDelay = GetTuning(m_TuneZone)->m_HammerHitFireDelay;
+			float FireDelay = GetTuning(GetOverriddenTuneZone())->m_HammerHitFireDelay;
 			m_ReloadTimer = FireDelay * GameWorld()->GameTickSpeed() / 1000;
 		}
 	}
@@ -367,7 +366,7 @@ void CCharacter::FireWeapon()
 	{
 		if(!m_Core.m_Jetpack)
 		{
-			int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(m_TuneZone)->m_GunLifetime);
+			int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(GetOverriddenTuneZone())->m_GunLifetime);
 
 			new CProjectile(
 				GameWorld(),
@@ -412,7 +411,7 @@ void CCharacter::FireWeapon()
 		}
 		else if(GameWorld()->m_WorldConfig.m_IsDDRace)
 		{
-			float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
+			float LaserReach = GetTuning(GetOverriddenTuneZone())->m_LaserReach;
 
 			new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCid(), WEAPON_SHOTGUN);
 		}
@@ -421,7 +420,7 @@ void CCharacter::FireWeapon()
 
 	case WEAPON_GRENADE:
 	{
-		int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(m_TuneZone)->m_GrenadeLifetime);
+		int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(GetOverriddenTuneZone())->m_GrenadeLifetime);
 
 		new CProjectile(
 			GameWorld(),
@@ -439,7 +438,7 @@ void CCharacter::FireWeapon()
 
 	case WEAPON_LASER:
 	{
-		float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;
+		float LaserReach = GetTuning(GetOverriddenTuneZone())->m_LaserReach;
 
 		new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCid(), WEAPON_LASER);
 	}
@@ -462,7 +461,7 @@ void CCharacter::FireWeapon()
 	if(!m_ReloadTimer)
 	{
 		float FireDelay;
-		GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+		GetTuning(GetOverriddenTuneZone())->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
 
 		m_ReloadTimer = FireDelay * GameWorld()->GameTickSpeed() / 1000;
 	}
@@ -952,8 +951,8 @@ void CCharacter::HandleTuneLayer()
 	SetTuneZone(GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(CurrentIndex) : 0);
 
 	if(m_IsLocal)
-		GameWorld()->m_Core.m_aTuning[g_Config.m_ClDummy] = *GetTuning(m_TuneZone); // throw tunings (from specific zone if in a tunezone) into gamecore if the character is local
-	m_Core.m_Tuning = *GetTuning(m_TuneZone);
+		GameWorld()->m_Core.m_aTuning[g_Config.m_ClDummy] = *GetTuning(GetOverriddenTuneZone()); // throw tunings (from specific zone if in a tunezone) into gamecore if the character is local
+	m_Core.m_Tuning = *GetTuning(GetOverriddenTuneZone());
 }
 
 void CCharacter::DDRaceTick()
@@ -1240,6 +1239,7 @@ void CCharacter::Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtende
 
 		m_TeleCheckpoint = pExtended->m_TeleCheckpoint;
 		m_StrongWeakId = pExtended->m_StrongWeakId;
+		m_TuneZoneOverride = pExtended->m_TuneZoneOverride;
 
 		const bool Ninja = (pExtended->m_Flags & CHARACTERFLAG_WEAPON_NINJA) != 0;
 		if(Ninja && m_Core.m_ActiveWeapon != WEAPON_NINJA)
@@ -1341,6 +1341,8 @@ void CCharacter::Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtende
 			m_Core.m_DeepFrozen = false;
 			UnFreeze();
 		}
+
+		m_TuneZoneOverride = -1;
 	}
 
 	vec2 PosBefore = m_Pos;
@@ -1394,7 +1396,7 @@ void CCharacter::Read(CNetObj_Character *pChar, CNetObj_DDNetCharacter *pExtende
 		if(maximum(m_LastTuneZoneTick, m_LastWeaponSwitchTick) + GameWorld()->GameTickSpeed() < GameWorld()->GameTick())
 		{
 			float FireDelay;
-			GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
+			GetTuning(GetOverriddenTuneZone())->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);
 			const int FireDelayTicks = FireDelay * GameWorld()->GameTickSpeed() / 1000;
 			m_ReloadTimer = maximum(0, m_AttackTick + FireDelayTicks - GameWorld()->GameTick());
 		}
@@ -1425,6 +1427,16 @@ void CCharacter::SetTuneZone(int Zone)
 	m_LastTuneZoneTick = GameWorld()->GameTick();
 }
 
+int CCharacter::GetOverriddenTuneZone() const
+{
+	return m_TuneZoneOverride < 0 ? m_TuneZone : m_TuneZoneOverride;
+}
+
+int CCharacter::GetPureTuneZone() const
+{
+	return m_TuneZone;
+}
+
 CCharacter::~CCharacter()
 {
 	if(GameWorld())
diff --git a/src/game/client/prediction/entities/character.h b/src/game/client/prediction/entities/character.h
@@ -75,7 +75,6 @@ class CCharacter : public CEntity
 	bool m_NinjaJetpack;
 	int m_FreezeTime;
 	bool m_FrozenLastTick;
-	int m_TuneZone;
 	vec2 m_PrevPos;
 	vec2 m_PrevPrevPos;
 	int m_TeleCheckpoint;
@@ -127,6 +126,8 @@ class CCharacter : public CEntity
 	bool Match(CCharacter *pChar) const;
 	void ResetPrediction();
 	void SetTuneZone(int Zone);
+	int GetOverriddenTuneZone() const;
+	int GetPureTuneZone() const;
 
 	bool HammerHitDisabled() { return m_Core.m_HammerHitDisabled; }
 	bool ShotgunHitDisabled() { return m_Core.m_ShotgunHitDisabled; }
@@ -159,6 +160,10 @@ class CCharacter : public CEntity
 
 	int m_NumInputs;
 
+	// tune
+	int m_TuneZone;
+	int m_TuneZoneOverride;
+
 	// the player core for the physics
 	CCharacterCore m_Core;
 
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
@@ -41,11 +41,6 @@
 
 */
 
-enum
-{
-	NUM_TUNEZONES = 256
-};
-
 class CCharacter;
 class IConfigManager;
 class CConfig;

Original file line number	Diff line number	Diff line change
`@@ -2971,7 +2971,11 @@ void CGameClient::UpdatePrediction()`
`2971`	`2971`
`2972`	`2972`	`if(m_GameWorld.m_WorldConfig.m_UseTuneZones)`
`2973`	`2973`	`{`
`2974`		`- int TuneZone = Collision()->IsTune(Collision()->GetMapIndex(LocalCharPos));`
	`2974`	`+ int TuneZone =`
	`2975`	`+ m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_HasExtendedData &&`
	`2976`	`+ m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_ExtendedData.m_TuneZoneOverride != -1 ?`
	`2977`	`+ m_Snap.m_aCharacters[m_Snap.m_LocalClientId].m_ExtendedData.m_TuneZoneOverride :`
	`2978`	`+ Collision()->IsTune(Collision()->GetMapIndex(LocalCharPos));`
`2975`	`2979`
`2976`	`2980`	`if(TuneZone != m_aLocalTuneZone[g_Config.m_ClDummy])`
`2977`	`2981`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,8 @@ void CCharacter::HandleJetpack()`
`84`	`84`	`{`
`85`	`85`	`if(m_Core.m_Jetpack)`
`86`	`86`	`{`
`87`		`- float Strength = GetTuning(m_TuneZone)->m_JetpackStrength;`
`88`		`- if(!m_TuneZone)`
`89`		`- Strength = m_LastJetpackStrength;`
	`87`	`+ int TuneZone = GetOverriddenTuneZone();`
	`88`	`+ float Strength = TuneZone ? GetTuning(TuneZone)->m_JetpackStrength : m_LastJetpackStrength;`
`90`	`89`	`TakeDamage(Direction * -1.0f * (Strength / 100.0f / 6.11f), 0, GetCid(), m_Core.m_ActiveWeapon);`
`91`	`90`	`}`
`92`	`91`	`}`
`@@ -130,7 +129,7 @@ void CCharacter::HandleNinja()`
`130`	`129`	`// Set velocity`
`131`	`130`	`m_Core.m_Vel = m_Core.m_Ninja.m_ActivationDir * g_pData->m_Weapons.m_Ninja.m_Velocity;`
`132`	`131`	`vec2 OldPos = m_Pos;`
`133`		`- Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(m_ProximityRadius, m_ProximityRadius), vec2(GetTuning(m_TuneZone)->m_GroundElasticityX, GetTuning(m_TuneZone)->m_GroundElasticityY));`
	`132`	`+ Collision()->MoveBox(&m_Core.m_Pos, &m_Core.m_Vel, vec2(m_ProximityRadius, m_ProximityRadius), vec2(GetTuning(GetOverriddenTuneZone())->m_GroundElasticityX, GetTuning(GetOverriddenTuneZone())->m_GroundElasticityY));`
`134`	`133`
`135`	`134`	`// reset velocity so the client doesn't predict stuff`
`136`	`135`	`m_Core.m_Vel = vec2(0.f, 0.f);`
`@@ -323,7 +322,7 @@ void CCharacter::FireWeapon()`
`323`	`322`	`else`
`324`	`323`	`Dir = vec2(0.f, -1.f);`
`325`	`324`
`326`		`- float Strength = GetTuning(m_TuneZone)->m_HammerStrength;`
	`325`	`+ float Strength = GetTuning(GetOverriddenTuneZone())->m_HammerStrength;`
`327`	`326`
`328`	`327`	`vec2 Temp = pTarget->m_Core.m_Vel + normalize(Dir + vec2(0.f, -1.1f)) * 10.0f;`
`329`	`328`	`Temp = ClampVel(pTarget->m_MoveRestrictions, Temp);`
`@@ -357,7 +356,7 @@ void CCharacter::FireWeapon()`
`357`	`356`	`// if we Hit anything, we have to wait for the reload`
`358`	`357`	`if(Hits)`
`359`	`358`	`{`
`360`		`- float FireDelay = GetTuning(m_TuneZone)->m_HammerHitFireDelay;`
	`359`	`+ float FireDelay = GetTuning(GetOverriddenTuneZone())->m_HammerHitFireDelay;`
`361`	`360`	`m_ReloadTimer = FireDelay * GameWorld()->GameTickSpeed() / 1000;`
`362`	`361`	`}`
`363`	`362`	`}`
`@@ -367,7 +366,7 @@ void CCharacter::FireWeapon()`
`367`	`366`	`{`
`368`	`367`	`if(!m_Core.m_Jetpack)`
`369`	`368`	`{`
`370`		`- int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(m_TuneZone)->m_GunLifetime);`
	`369`	`+ int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(GetOverriddenTuneZone())->m_GunLifetime);`
`371`	`370`
`372`	`371`	`new CProjectile(`
`373`	`372`	`GameWorld(),`
`@@ -412,7 +411,7 @@ void CCharacter::FireWeapon()`
`412`	`411`	`}`
`413`	`412`	`else if(GameWorld()->m_WorldConfig.m_IsDDRace)`
`414`	`413`	`{`
`415`		`- float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;`
	`414`	`+ float LaserReach = GetTuning(GetOverriddenTuneZone())->m_LaserReach;`
`416`	`415`
`417`	`416`	`new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCid(), WEAPON_SHOTGUN);`
`418`	`417`	`}`
`@@ -421,7 +420,7 @@ void CCharacter::FireWeapon()`
`421`	`420`
`422`	`421`	`case WEAPON_GRENADE:`
`423`	`422`	`{`
`424`		`- int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(m_TuneZone)->m_GrenadeLifetime);`
	`423`	`+ int Lifetime = (int)(GameWorld()->GameTickSpeed() * GetTuning(GetOverriddenTuneZone())->m_GrenadeLifetime);`
`425`	`424`
`426`	`425`	`new CProjectile(`
`427`	`426`	`GameWorld(),`
`@@ -439,7 +438,7 @@ void CCharacter::FireWeapon()`
`439`	`438`
`440`	`439`	`case WEAPON_LASER:`
`441`	`440`	`{`
`442`		`- float LaserReach = GetTuning(m_TuneZone)->m_LaserReach;`
	`441`	`+ float LaserReach = GetTuning(GetOverriddenTuneZone())->m_LaserReach;`
`443`	`442`
`444`	`443`	`new CLaser(GameWorld(), m_Pos, Direction, LaserReach, GetCid(), WEAPON_LASER);`
`445`	`444`	`}`
`@@ -462,7 +461,7 @@ void CCharacter::FireWeapon()`
`462`	`461`	`if(!m_ReloadTimer)`
`463`	`462`	`{`
`464`	`463`	`float FireDelay;`
`465`		`- GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);`
	`464`	`+ GetTuning(GetOverriddenTuneZone())->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);`
`466`	`465`
`467`	`466`	`m_ReloadTimer = FireDelay * GameWorld()->GameTickSpeed() / 1000;`
`468`	`467`	`}`
`@@ -952,8 +951,8 @@ void CCharacter::HandleTuneLayer()`
`952`	`951`	`SetTuneZone(GameWorld()->m_WorldConfig.m_UseTuneZones ? Collision()->IsTune(CurrentIndex) : 0);`
`953`	`952`
`954`	`953`	`if(m_IsLocal)`
`955`		`- GameWorld()->m_Core.m_aTuning[g_Config.m_ClDummy] = *GetTuning(m_TuneZone); // throw tunings (from specific zone if in a tunezone) into gamecore if the character is local`
`956`		`- m_Core.m_Tuning = *GetTuning(m_TuneZone);`
	`954`	`+ GameWorld()->m_Core.m_aTuning[g_Config.m_ClDummy] = *GetTuning(GetOverriddenTuneZone()); // throw tunings (from specific zone if in a tunezone) into gamecore if the character is local`
	`955`	`+ m_Core.m_Tuning = *GetTuning(GetOverriddenTuneZone());`
`957`	`956`	`}`
`958`	`957`
`959`	`958`	`void CCharacter::DDRaceTick()`
`@@ -1240,6 +1239,7 @@ void CCharacter::Read(CNetObj_Character pChar, CNetObj_DDNetCharacter pExtende`
`1240`	`1239`
`1241`	`1240`	`m_TeleCheckpoint = pExtended->m_TeleCheckpoint;`
`1242`	`1241`	`m_StrongWeakId = pExtended->m_StrongWeakId;`
	`1242`	`+ m_TuneZoneOverride = pExtended->m_TuneZoneOverride;`
`1243`	`1243`
`1244`	`1244`	`const bool Ninja = (pExtended->m_Flags & CHARACTERFLAG_WEAPON_NINJA) != 0;`
`1245`	`1245`	`if(Ninja && m_Core.m_ActiveWeapon != WEAPON_NINJA)`
`@@ -1341,6 +1341,8 @@ void CCharacter::Read(CNetObj_Character pChar, CNetObj_DDNetCharacter pExtende`
`1341`	`1341`	`m_Core.m_DeepFrozen = false;`
`1342`	`1342`	`UnFreeze();`
`1343`	`1343`	`}`
	`1344`	`+`
	`1345`	`+ m_TuneZoneOverride = -1;`
`1344`	`1346`	`}`
`1345`	`1347`
`1346`	`1348`	`vec2 PosBefore = m_Pos;`
`@@ -1394,7 +1396,7 @@ void CCharacter::Read(CNetObj_Character pChar, CNetObj_DDNetCharacter pExtende`
`1394`	`1396`	`if(maximum(m_LastTuneZoneTick, m_LastWeaponSwitchTick) + GameWorld()->GameTickSpeed() < GameWorld()->GameTick())`
`1395`	`1397`	`{`
`1396`	`1398`	`float FireDelay;`
`1397`		`- GetTuning(m_TuneZone)->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);`
	`1399`	`+ GetTuning(GetOverriddenTuneZone())->Get(38 + m_Core.m_ActiveWeapon, &FireDelay);`
`1398`	`1400`	`const int FireDelayTicks = FireDelay * GameWorld()->GameTickSpeed() / 1000;`
`1399`	`1401`	`m_ReloadTimer = maximum(0, m_AttackTick + FireDelayTicks - GameWorld()->GameTick());`
`1400`	`1402`	`}`
`@@ -1425,6 +1427,16 @@ void CCharacter::SetTuneZone(int Zone)`
`1425`	`1427`	`m_LastTuneZoneTick = GameWorld()->GameTick();`
`1426`	`1428`	`}`
`1427`	`1429`
	`1430`	`+int CCharacter::GetOverriddenTuneZone() const`
	`1431`	`+{`
	`1432`	`+ return m_TuneZoneOverride < 0 ? m_TuneZone : m_TuneZoneOverride;`
	`1433`	`+}`
	`1434`	`+`
	`1435`	`+int CCharacter::GetPureTuneZone() const`
	`1436`	`+{`
	`1437`	`+ return m_TuneZone;`
	`1438`	`+}`
	`1439`	`+`
`1428`	`1440`	`CCharacter::~CCharacter()`
`1429`	`1441`	`{`
`1430`	`1442`	`if(GameWorld())`