diff options
| author | Simon Howard | 2006-01-28 20:03:09 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-01-28 20:03:09 +0000 |
| commit | 42d8c02ca47eda7ab9273dcc6ed83a269befbfdd (patch) | |
| tree | fb284e641048c286750cd34f4e4f43e28fc61f09 | |
| parent | 305ed7daf479c4c6fddec3bab334c38c46306012 (diff) | |
| download | chocolate-doom-42d8c02ca47eda7ab9273dcc6ed83a269befbfdd.tar.gz chocolate-doom-42d8c02ca47eda7ab9273dcc6ed83a269befbfdd.tar.bz2 chocolate-doom-42d8c02ca47eda7ab9273dcc6ed83a269befbfdd.zip | |
Avoid conflict with stdc time function
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 352
| -rw-r--r-- | src/wi_stuff.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/wi_stuff.c b/src/wi_stuff.c index b83df74c..da51d3e3 100644 --- a/src/wi_stuff.c +++ b/src/wi_stuff.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: wi_stuff.c 320 2006-01-22 21:21:02Z fraggle $ +// $Id: wi_stuff.c 352 2006-01-28 20:03:09Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,9 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.5 2006/01/28 20:03:09 fraggle +// Avoid conflict with stdc time function +// // Revision 1.4 2006/01/22 21:21:02 fraggle // Dehacked string replacements for intermission screen graphic lumps // @@ -41,7 +44,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: wi_stuff.c 320 2006-01-22 21:21:02Z fraggle $"; +rcsid[] = "$Id: wi_stuff.c 352 2006-01-28 20:03:09Z fraggle $"; #include <stdio.h> @@ -393,7 +396,7 @@ static patch_t* items; static patch_t* frags; // Time sucks. -static patch_t* time; +static patch_t* timepatch; static patch_t* par; static patch_t* sucks; @@ -1476,7 +1479,7 @@ void WI_drawStats(void) V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, FB, sp_secret); WI_drawPercent(SCREENWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]); - V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, time); + V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, timepatch); WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time); if (wbs->epsd < 3) @@ -1691,7 +1694,7 @@ void WI_loadData(void) colon = W_CacheLumpName(DEH_String("WICOLON"), PU_STATIC); // "time" - time = W_CacheLumpName(DEH_String("WITIME"), PU_STATIC); + timepatch = W_CacheLumpName(DEH_String("WITIME"), PU_STATIC); // "sucks" sucks = W_CacheLumpName(DEH_String("WISUCKS"), PU_STATIC); @@ -1774,7 +1777,7 @@ void WI_unloadData(void) Z_ChangeTag(sp_secret, PU_CACHE); Z_ChangeTag(items, PU_CACHE); Z_ChangeTag(frags, PU_CACHE); - Z_ChangeTag(time, PU_CACHE); + Z_ChangeTag(timepatch, PU_CACHE); Z_ChangeTag(sucks, PU_CACHE); Z_ChangeTag(par, PU_CACHE); |