fix: timer (#39)

rick-yao · Dec 26, 2024 · 5ef85ff · 5ef85ff
1 parent b952d10
commit 5ef85ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/l4d2_tank_draw/scripting/lib/lib.sp b/l4d2_tank_draw/scripting/lib/lib.sp
@@ -64,7 +64,7 @@ ConVar
 	DrugLuckySurvivorDuration;
 
 Handle g_SingleGravityTimer[MAXPLAYERS + 1] = { INVALID_HANDLE, ... };
-Handle g_WorldGravityTimer		    = INVALID_HANDLE;
+Handle g_WorldGravityTimer;
 
 Handle g_hDrugTimers[MAXPLAYERS + 1];
 int    g_iDrugTicks[MAXPLAYERS + 1];
@@ -134,7 +134,7 @@ stock Action ResetWorldGravity(Handle timer, int initValue)
 	CPrintToChatAll("%t", "TankDraw_WorldGravityReset");
 	PrintHintTextToAll("%t", "TankDraw_WorldGravityReset_NoColor");
 
-	g_WorldGravityTimer = INVALID_HANDLE;
+	g_WorldGravityTimer = null;
 
 	return Plugin_Continue;
 }

diff --git a/l4d2_tank_draw/scripting/lib/lucky_draw.sp b/l4d2_tank_draw/scripting/lib/lucky_draw.sp
@@ -272,10 +272,9 @@ stock Action LuckyDraw(int victim, int attacker)
 
 		g_WorldGravity.IntValue = WorldMoonGravity.IntValue;
 
-		if (g_WorldGravityTimer != INVALID_HANDLE)
+		if (g_WorldGravityTimer != null)
 		{
-			KillTimer(g_WorldGravityTimer);
-			g_WorldGravityTimer = INVALID_HANDLE;
+			delete g_WorldGravityTimer;
 		}
 		g_WorldGravityTimer = CreateTimer(GetConVarFloat(LimitedTimeWorldMoonGravityTimer), ResetWorldGravity, default_gravity_int, NO_REPEAT_TIMER);
 		CPrintToChatAll("%t", "TankDrawResult_LimitedMoonGravity", attackerName, GetConVarInt(LimitedTimeWorldMoonGravityTimer));
@@ -319,6 +318,11 @@ stock Action LuckyDraw(int victim, int attacker)
 		}
 		else {
 			g_WorldGravity.RestoreDefault();
+			// before timer ends, if draw this prize, should clear timer
+			if (g_WorldGravityTimer != null)
+			{
+				delete g_WorldGravityTimer;
+			}
 			CPrintToChatAll("%t", "TankDrawResult_DisableMoonGravity", attackerName);
 			PrintHintTextToAll("%t", "TankDrawResult_DisableMoonGravity_NoColor", attackerName);
 		}