diff options
| author | joerg <joerg@pkgsrc.org> | 2006-09-24 13:50:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-09-24 13:50:08 +0000 |
| commit | a56127420d2af53065b17d3929d9f4862029d2a0 (patch) | |
| tree | 04a5a422c4ad031e1e385e3ebdb0ff228ace8b28 /games/xdoom | |
| parent | 92825861863449ee489546b83262f8b32589762d (diff) | |
| download | pkgsrc-a56127420d2af53065b17d3929d9f4862029d2a0.tar.gz | |
Rename static variable to avoid conflict with time(2).
Diffstat (limited to 'games/xdoom')
| -rw-r--r-- | games/xdoom/distinfo | 3 | ||||
| -rw-r--r-- | games/xdoom/patches/patch-bd | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/games/xdoom/distinfo b/games/xdoom/distinfo index f5ac1547b92..a6606d00dee 100644 --- a/games/xdoom/distinfo +++ b/games/xdoom/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2006/01/13 00:04:16 joerg Exp $ +$NetBSD: distinfo,v 1.15 2006/09/24 13:50:08 joerg Exp $ SHA1 (doomsrc.zip) = ffd07e0bd95b7c6ba0cd003fb6ff5ebd535d6f99 RMD160 (doomsrc.zip) = c88e57b3cc72ca8bbfacbe138f8a3c69a13bf2e1 @@ -35,3 +35,4 @@ SHA1 (patch-az) = 48690eebd65de95b7ce4fd73390b46ffd6a58085 SHA1 (patch-ba) = d8e41ed9d277145cd776ca5dc18e1c82cbefc8b7 SHA1 (patch-bb) = 28dbedb6209466f5b9ad226e2a5583c3881acae1 SHA1 (patch-bc) = e55e08d525469b44f96fbd45aeed0bedee0a9d8c +SHA1 (patch-bd) = 35f01a7d790bb8683a6a4b72581dbe10307c57ed diff --git a/games/xdoom/patches/patch-bd b/games/xdoom/patches/patch-bd new file mode 100644 index 00000000000..b53a44c4727 --- /dev/null +++ b/games/xdoom/patches/patch-bd @@ -0,0 +1,40 @@ +$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); + |