From a8a4f4fbb0ffe56f71df71b67c1f6fc80fd760b5 Mon Sep 17 00:00:00 2001 From: Greyscale Date: Mon, 30 Mar 2009 00:35:51 +0200 Subject: [PATCH] Changed all CloseHandle's on timers to KillTimer() --- src/zr/event.inc | 16 ++++++++-------- src/zr/zombie.inc | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/zr/event.inc b/src/zr/event.inc index 88fa80a..bcc9cad 100644 --- a/src/zr/event.inc +++ b/src/zr/event.inc @@ -38,13 +38,13 @@ public Action:RoundStart(Handle:event, const String:name[], bool:dontBroadcast) if (tRound != INVALID_HANDLE) { - CloseHandle(tRound); + KillTimer(tRound); tRound = INVALID_HANDLE; } if (tInfect != INVALID_HANDLE) { - CloseHandle(tInfect); + KillTimer(tInfect); tInfect = INVALID_HANDLE; } @@ -57,7 +57,7 @@ public Action:RoundFreezeEnd(Handle:event, const String:name[], bool:dontBroadca if (tRound != INVALID_HANDLE) { - CloseHandle(tRound); + KillTimer(tRound); } new Float:roundlen = GetConVarFloat(FindConVar("mp_roundtime")) * 60.0; @@ -65,7 +65,7 @@ public Action:RoundFreezeEnd(Handle:event, const String:name[], bool:dontBroadca if (tInfect != INVALID_HANDLE) { - CloseHandle(tInfect); + KillTimer(tInfect); } new Float:min = GetConVarFloat(gCvars[CVAR_SPAWN_MIN]); @@ -81,13 +81,13 @@ public Action:RoundEnd(Handle:event, const String:name[], bool:dontBroadcast) { if (tRound != INVALID_HANDLE) { - CloseHandle(tRound); + KillTimer(tRound); tRound = INVALID_HANDLE; } if (tInfect != INVALID_HANDLE) { - CloseHandle(tInfect); + KillTimer(tInfect); tInfect = INVALID_HANDLE; } @@ -156,7 +156,7 @@ public Action:PlayerSpawn(Handle:event, const String:name[], bool:dontBroadcast) if (tHandles[index][x] != INVALID_HANDLE) { - CloseHandle(tHandles[index][x]); + KillTimer(tHandles[index][x]); tHandles[index][x] = INVALID_HANDLE; } } @@ -224,7 +224,7 @@ public Action:PlayerSpawn(Handle:event, const String:name[], bool:dontBroadcast) if (tHandles[index][TPROTECT] != INVALID_HANDLE) { - CloseHandle(tHandles[index][TPROTECT]); + KillTimer(tHandles[index][TPROTECT]); } pTimeLeft[index] = protect; diff --git a/src/zr/zombie.inc b/src/zr/zombie.inc index 9be63f9..cf09259 100644 --- a/src/zr/zombie.inc +++ b/src/zr/zombie.inc @@ -200,7 +200,7 @@ Zombify_Mother(client) { if (tHandles[client][TMOAN] != INVALID_HANDLE) { - CloseHandle(tHandles[client][TMOAN]); + KillTimer(tHandles[client][TMOAN]); } tHandles[client][TMOAN] = CreateTimer(interval, ZombieMoanTimer, client, TIMER_REPEAT); } @@ -209,13 +209,13 @@ Zombify_Mother(client) { pProtect[client] = false; - CloseHandle(tHandles[client][TPROTECT]); + KillTimer(tHandles[client][TPROTECT]); tHandles[client][TPROTECT] = INVALID_HANDLE; } if (tHandles[client][TZHP] != INVALID_HANDLE) { - CloseHandle(tHandles[client][TZHP]); + KillTimer(tHandles[client][TZHP]); tHandles[client][TZHP] = INVALID_HANDLE; } @@ -281,7 +281,7 @@ Zombify(client, attacker) { if (tHandles[client][TMOAN] != INVALID_HANDLE) { - CloseHandle(tHandles[client][TMOAN]); + KillTimer(tHandles[client][TMOAN]); } tHandles[client][TMOAN] = CreateTimer(interval, ZombieMoanTimer, client, TIMER_REPEAT); } @@ -290,13 +290,13 @@ Zombify(client, attacker) { pProtect[client] = false; - CloseHandle(tHandles[client][TPROTECT]); + KillTimer(tHandles[client][TPROTECT]); tHandles[client][TPROTECT] = INVALID_HANDLE; } if (tHandles[client][TZHP] != INVALID_HANDLE) { - CloseHandle(tHandles[client][TZHP]); + KillTimer(tHandles[client][TZHP]); tHandles[client][TZHP] = INVALID_HANDLE; }