From 5fd77bb31ca975a9132d3173a6346f4c197fd1fa Mon Sep 17 00:00:00 2001
From: Mark Olsen <isthisinuse@users.sourceforge.net>
Date: Tue, 29 Nov 2005 11:30:13 +0000
Subject: [PATCH] Renamed timer to mytimer to avoid nameclash with system
 function of same name

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1617 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/server/sv_ccmds.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engine/server/sv_ccmds.c b/engine/server/sv_ccmds.c
index fbb186543..7ce68ae25 100644
--- a/engine/server/sv_ccmds.c
+++ b/engine/server/sv_ccmds.c
@@ -1568,7 +1568,7 @@ void SV_SnapAll_f (void)
 	}
 }
 
-float timer;
+float mytimer;
 float lasttimer;
 int ticsleft;
 float timerinterval;
@@ -1578,14 +1578,14 @@ void SV_CheckTimer(void)
 {
 	float ctime = Sys_DoubleTime();
 //	if (ctime < lasttimer) //new map? (shouldn't happen)
-//		timer = ctime+5;	//trigger in a few secs
+//		mytimer = ctime+5;	//trigger in a few secs
 	lasttimer = ctime;
 
 	if (ticsleft)
 	{
-		if (timer < ctime)
+		if (mytimer < ctime)
 		{
-			timer += timerinterval;
+			mytimer += timerinterval;
 			if (ticsleft > 0)
 				ticsleft--;
 
@@ -1631,7 +1631,7 @@ void SV_SetTimer_f(void)
 	timercommand = Cvar_Get("sv_timer", "", CVAR_NOSET, NULL);
 	Cvar_ForceSet(timercommand, command);
 
-	timer = Sys_DoubleTime() + interval;
+	mytimer = Sys_DoubleTime() + interval;
 	ticsleft = count;
 	timerinterval = interval;