summaryrefslogtreecommitdiff
path: root/games/woof/patches/patch-Source_wi__stuff.c
diff options
context:
space:
mode:
authormicha <micha@pkgsrc.org>2021-09-29 11:54:40 +0000
committermicha <micha@pkgsrc.org>2021-09-29 11:54:40 +0000
commit9f09a9c6d6f35e8b24ffea0a49452dbcd5ba7699 (patch)
treed69f7b85847012540eaa73b257de5c0ff4d15c1c /games/woof/patches/patch-Source_wi__stuff.c
parent4f204d8a4946c5a5ca18983810d9b723775e9cfe (diff)
downloadpkgsrc-9f09a9c6d6f35e8b24ffea0a49452dbcd5ba7699.tar.gz
games/woof: Update to 7.0.0
Woof! 7.0.0 ----------- - Options loaded from a PWAD are now disabled in the menu instead of merely skipped (@rfomin). - Trim trailing spaces off the demo footer. - OPL emulation based on Nuked OPL3 Version1.8 has been ported over from Chocolate Doom. - Avoid namespace clash with the time symbol, e.g. on SmartOS. - Use unambigious integer types in the BMP screenshot saving code. - The Alt-Tab bug workaround has been extended to SDL 2.0.16 (@rfomin). - The actual sample frequency is now fed back into snd_samplerate config variable. - Native Windows MIDI support has been implemented, replacing woof-midiproc (@rfomin). - The demo_version value is now logged in P_SetupLevel(). - Don't change MUSINFO music if nomusicparm is set (@rfomin). - Fix wrong generalised door sounds (@rfomin). - Fix the Boom elevators movement interpolation (@rfomin). - Enable cosmetic compatibility options for all complevels, i.e. comp_blazing, comp_doorlight and comp_skymap (@rfomin). - Next level key also skips the current demo (@rfomin). - cmake: always unzip SDL2 binaries in build directory (@melak47). - Fix M_PAUSE graphics location in hires mode (@rfomin). - Make keyed doors flash on the automap, ported over from Crispy Doom (@rfomin). - Keep the map static in overlay mode if not following the player. - Implement DSDHacked support (@rfomin). - Fix the dehacked string replacement behavior (@rfomin). - Fixed a bug in DeHackEd string replacements with a length of exactly four (@JadingTsunami). - Add comp_voodooscroller, MBF21 v1.3 update (@rfomin). - Demo features (@rfomin). - If a new game is started during demo recording, start a new demo. - Add key to finish demo recording. - Count spawned monsters - Add demo file name suffix counter, rngseed is generated before restart recording. - Use SDL functions to load a WAV lump (@rfomin).
Diffstat (limited to 'games/woof/patches/patch-Source_wi__stuff.c')
-rw-r--r--games/woof/patches/patch-Source_wi__stuff.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/games/woof/patches/patch-Source_wi__stuff.c b/games/woof/patches/patch-Source_wi__stuff.c
deleted file mode 100644
index c5e439ab381..00000000000
--- a/games/woof/patches/patch-Source_wi__stuff.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-Source_wi__stuff.c,v 1.2 2021/08/27 10:47:40 micha Exp $
-
-Workaround for namespace clash on SmartOS:
-
-/home/pbulk/build/games/woof/work/woof-woof_6.3.1/Source/wi_stuff.c:366:19: error: 'time' redeclared as different kind of symbol
- 366 | static patch_t* time;
- | ^~~~
-
-Already merged upstream. Remove this patch for next release.
-
---- Source/wi_stuff.c.orig 2021-08-13 13:18:32.000000000 +0000
-+++ Source/wi_stuff.c
-@@ -363,7 +363,7 @@ static patch_t* items;
- static patch_t* frags;
-
- // Time sucks.
--static patch_t* time;
-+static patch_t* woof_time;
- static patch_t* par;
- static patch_t* sucks;
-
-@@ -897,7 +897,7 @@ static 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(woof_time, PU_CACHE);
- Z_ChangeTag(sucks, PU_CACHE);
- Z_ChangeTag(par, PU_CACHE);
-
-@@ -1815,7 +1815,7 @@ static void WI_drawStats(void)
- V_DrawPatch(SP_STATSX, SP_STATSY+2*lh, FB, sp_secret);
- WI_drawPercent(ORIGWIDTH - SP_STATSX, SP_STATSY+2*lh, cnt_secret[0]);
-
-- V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, time);
-+ V_DrawPatch(SP_TIMEX, SP_TIMEY, FB, woof_time);
- WI_drawTime(ORIGWIDTH/2 - SP_TIMEX, SP_TIMEY, cnt_time, true);
-
- // Ty 04/11/98: redid logic: should skip only if with pwad but
-@@ -2077,7 +2077,7 @@ void WI_loadData(void)
- colon = W_CacheLumpName("WICOLON", PU_STATIC);
-
- // "time"
-- time = W_CacheLumpName("WITIME", PU_STATIC);
-+ woof_time = W_CacheLumpName("WITIME", PU_STATIC);
-
- // "sucks"
- sucks = W_CacheLumpName("WISUCKS", PU_STATIC);