From 54677627206b1c7ecefe903c21b5ac4f74119aa2 Mon Sep 17 00:00:00 2001
From: RD42 <42702181+dashr9230@users.noreply.github.com>
Date: Tue, 25 Jun 2024 22:29:12 +0800
Subject: [PATCH] [server] Implement `CScriptTimers::Process(...)`

* Implement `CScriptTimers::Delete(...)`
* Update `CNetGame::Process()`
---
 server/netgame.cpp   |  1 +
 server/scrtimers.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++++
 server/scrtimers.h   |  2 ++
 3 files changed, 71 insertions(+)

diff --git a/server/netgame.cpp b/server/netgame.cpp
index 20bb628..b0e58cc 100644
--- a/server/netgame.cpp
+++ b/server/netgame.cpp
@@ -595,6 +595,7 @@ void CNetGame::Process()
 	if(m_iGameState == GAMESTATE_RUNNING)
 	{
 		if(m_pGameMode) m_pGameMode->Frame(fElapsedTime);
+		if(m_pScriptTimers) m_pScriptTimers->Process((DWORD)(fElapsedTime * 1000.0f));
 	}
 	else if(m_iGameState == GAMESTATE_RESTARTING) 
 	{
diff --git a/server/scrtimers.cpp b/server/scrtimers.cpp
index 126054b..70ab498 100644
--- a/server/scrtimers.cpp
+++ b/server/scrtimers.cpp
@@ -160,6 +160,20 @@ DWORD CScriptTimers::NewEx(char* szScriptFunc, int iInterval, BOOL bRepeating, c
 
 //----------------------------------------------------------------------------------
 
+void CScriptTimers::Delete(DWORD dwTimerId)
+{
+	DwordTimerMap::iterator itor;
+	itor = m_Timers.find(dwTimerId);
+	if (itor != m_Timers.end())
+	{
+		FreeMem(itor->second);
+		SAFE_DELETE(itor->second);
+		m_Timers.erase(itor);
+	}
+}
+
+//----------------------------------------------------------------------------------
+
 void CScriptTimers::Kill(DWORD dwTimerId)
 {
 	DwordTimerMap::iterator itor;
@@ -174,3 +188,57 @@ void CScriptTimers::Kill(DWORD dwTimerId)
 
 //-----------------------------------------------------------
 
+void CScriptTimers::Process(int iElapsedTime)
+{
+	DwordTimerMap::iterator itor;
+	CGameMode *pGameMode;
+	for (itor = m_Timers.begin(); itor != m_Timers.end(); itor++)
+	{
+		itor->second->iRemainingTime -= iElapsedTime;
+		if (itor->second->iRemainingTime <= 0)
+		{
+			DwordTimerMap::iterator itor_tmp = ++itor; itor--;
+			if (!itor->second->bKilled)
+			{
+				pGameMode = pNetGame->GetGameMode();
+				if (pGameMode)
+				{
+					int idx;
+					AMX* amx = itor->second->pAMX;
+					if (amx && !amx_FindPublic(amx, itor->second->szScriptFunc, &idx))
+					{
+						cell ret;
+						int count = itor->second->iParamCount;
+						int i = 0;
+						if (count > 0)
+						{
+							cell* pars = (cell*)itor->second->cellParams;
+							while (i < count)
+							{
+								amx_Push(amx, pars[i]);
+								i++; // Go forwards to maintain push order
+							}
+						}
+						amx_Exec(amx, &ret, idx);
+					}
+				}
+			}
+
+			if (itor->second->bRepeating)
+			{
+				itor->second->iRemainingTime = itor->second->iTotalTime;
+			}
+			else
+			{
+				// Release parameter memory
+				FreeMem(itor->second);
+				Delete(itor->first);
+			}
+			itor = itor_tmp;
+		}
+		if (itor == m_Timers.end()) break;
+	}
+}
+
+//----------------------------------------------------------------------------------
+// EOF
diff --git a/server/scrtimers.h b/server/scrtimers.h
index ef88332..d719649 100644
--- a/server/scrtimers.h
+++ b/server/scrtimers.h
@@ -30,7 +30,9 @@ public:
 	void DeleteForMode(AMX* pEndedAMX);
 	DWORD New(char* szScriptFunc, int iInterval, BOOL bRepeating, AMX* pAMX);
 	DWORD NewEx(char* szScriptFunc, int iInterval, BOOL bRepeating, cell *params, AMX* pAMX);
+	void Delete(DWORD dwTimerId);
 	void Kill(DWORD dwTimerId);
+	void Process(int iElapsedTime);
 	void FreeMem(ScriptTimer_s* Timer);
 };