fix: kill timers on map end (#34)

srcdslab · Mar 6, 2024 · aed4025 · aed4025
1 parent 7637d33
commit aed4025
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/addons/sourcemod/scripting/zombiereloaded.sp b/src/addons/sourcemod/scripting/zombiereloaded.sp
@@ -45,7 +45,7 @@
 
 #include <sdkhooks>
 
-#define VERSION "3.10.1"
+#define VERSION "3.10.2"
 
 // Comment this line to exclude version info command. Enable this if you have
 // the repository and HG installed (Mercurial or TortoiseHG).
@@ -242,6 +242,8 @@ public void OnMapEnd()
     VEffectsOnMapEnd();
     ZombieSoundsOnMapEnd();
     ImmunityOnMapEnd();
+    OverlaysOnMapEnd();
+    SEffectsOnMapEnd();
 }
 
 /**

diff --git a/src/addons/sourcemod/scripting/zr/overlays.inc b/src/addons/sourcemod/scripting/zr/overlays.inc
@@ -75,6 +75,19 @@ void OverlaysOnMapStart()
     tOverlays = INVALID_HANDLE;
 }
 
+/**
+ * Map is ending.
+ */
+void OverlaysOnMapEnd()
+{
+    // If timer is running, kill it.
+    if (tOverlays != INVALID_HANDLE)
+    {
+        KillTimer(tOverlays);
+        tOverlays = INVALID_HANDLE;
+    }
+}
+
 /**
  * Client is joining the server.
  *

diff --git a/src/addons/sourcemod/scripting/zr/soundeffects/soundeffects.inc b/src/addons/sourcemod/scripting/zr/soundeffects/soundeffects.inc
@@ -58,6 +58,19 @@ void SEffectsOnMapStart()
     AmbientSoundsOnMapStart();
 }
 
+/**
+ * Map is ending.
+ */
+void SEffectsOnMapEnd()
+{
+    // If timer is running, kill it.
+    if (tAmbientSounds != INVALID_HANDLE)
+    {
+        KillTimer(tAmbientSounds);
+        tAmbientSounds = INVALID_HANDLE;
+    }
+}
+
 /**
  * Client is joining the server.
  *