ref: f8640f01d83dd649136fd648cfc3e272c4e729f5
parent: c0cc0ea1b4c7054ce97a11f2d156359e175ab4da
author: Simon Howard <[email protected]>
date: Wed May 6 20:49:43 EDT 2009
Fix conflict between 'time' variable and libc time function. Subversion-branch: /branches/raven-branch Subversion-revision: 1510
--- a/src/heretic/in_lude.c
+++ b/src/heretic/in_lude.c
@@ -78,7 +78,6 @@
static int cnt;
-static int time;
static int hours;
static int minutes;
static int seconds;
@@ -218,17 +217,17 @@
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)
{