[BACK]Return to patch-bd CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / games / xdoom / patches
File: [cvs.NetBSD.org] / pkgsrc / games / xdoom / patches / patch-bd (download)

Revision 1.1, Sun Sep 24 13:50:08 2006 UTC (17 years, 6 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, cwrapper, cube-native-xorg-base, cube-native-xorg 

Rename static variable to avoid conflict with time(2).

$NetBSD: patch-bd,v 1.1 2006/09/24 13:50:08 joerg Exp $

--- linuxdoom-1.10/wi_stuff.c.orig	2006-09-24 15:46:39.000000000 +0000
+++ linuxdoom-1.10/wi_stuff.c
@@ -373,7 +373,7 @@ static patch_t*		items;
 static patch_t*		frags;
 
 // Time sucks.
-static patch_t*		time;
+static patch_t*		my_time;
 static patch_t*		par;
 static patch_t*		sucks;
 
@@ -1456,7 +1456,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, my_time);
     WI_drawTime(SCREENWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time);
 
     if (wbs->epsd < 3)
@@ -1669,7 +1669,7 @@ void WI_loadData(void)
     colon = W_CacheLumpName("WICOLON", PU_STATIC); 
 
     // "time"
-    time = W_CacheLumpName("WITIME", PU_STATIC);   
+    my_time = W_CacheLumpName("WITIME", PU_STATIC);   
 
     // "sucks"
     sucks = W_CacheLumpName("WISUCKS", PU_STATIC);  
@@ -1752,7 +1752,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(my_time, PU_CACHE);
     Z_ChangeTag(sucks, PU_CACHE);
     Z_ChangeTag(par, PU_CACHE);