commit f8640f01d83dd649136fd648cfc3e272c4e729f5
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Thu May 7 00:49:43 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Thu May 7 00:49:43 2009 +0000
Fix conflict between 'time' variable and libc time function.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1510
---
src/heretic/in_lude.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/heretic/in_lude.c b/src/heretic/in_lude.c
index e29378eb..33b75956 100644
--- a/src/heretic/in_lude.c
+++ b/src/heretic/in_lude.c
@@ -78,7 +78,6 @@ static gametype_t gametype;
static int cnt;
-static int time;
static int hours;
static int minutes;
static int seconds;
@@ -218,17 +217,17 @@ void IN_InitStats(void)
int posnum;
int slaughtercount;
int playercount;
-
+ int count;
if (!netgame)
{
gametype = SINGLE;
- time = leveltime / 35;
- hours = time / 3600;
- time -= hours * 3600;
- minutes = time / 60;
- time -= minutes * 60;
- seconds = time;
+ count = leveltime / 35;
+ hours = count / 3600;
+ count -= hours * 3600;
+ minutes = count / 60;
+ count -= minutes * 60;
+ seconds = count;
}
else if (netgame && !deathmatch)
{