Commit 78b4dae5 authored by Fabian Greffrath's avatar Fabian Greffrath

Remove all patches, applied upstream

parent c93ee35a
From f96076090f1cdfd7e64088cf2c6832f85fa1f487 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Thu, 28 Feb 2019 10:32:21 +0100
Subject: [PATCH 1/2] only draw revealed secret sector boundaries in gold if
"Show Revealed Secrets" is enabled
Fixes #389, thanks @Zodomaniac
---
src/doom/am_map.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/doom/am_map.c b/src/doom/am_map.c
index f195bf25..21cc310b 100644
--- a/src/doom/am_map.c
+++ b/src/doom/am_map.c
@@ -1357,7 +1357,7 @@ void AM_drawWalls(void)
cheating && (lines[i].frontsector->special == 9))
AM_drawMline(&l, SECRETWALLCOLORS);
#if defined CRISPY_HIGHLIGHT_REVEALED_SECRETS
- // [crispy] draw revealed secrets in gold
+ // [crispy] draw revealed secret sector boundaries in gold
else
if (crispy->extautomap &&
crispy->secretmessage && (lines[i].frontsector->oldspecial == 9))
@@ -1385,7 +1385,7 @@ void AM_drawWalls(void)
}
#if defined CRISPY_HIGHLIGHT_REVEALED_SECRETS
// [crispy] draw revealed secret sector boundaries in gold
- else if (crispy->extautomap &&
+ else if (crispy->extautomap && crispy->secretmessage &&
(lines[i].backsector->oldspecial == 9 ||
lines[i].frontsector->oldspecial == 9))
{
--
2.20.1
From cf3420556ac1d4867160582ba2490562c6b1c588 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Thu, 28 Feb 2019 12:47:34 +0100
Subject: [PATCH 2/2] heretic: include "i_system.h" for I_Realloc()
---
src/heretic/r_segs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/heretic/r_segs.c b/src/heretic/r_segs.c
index d8da74dd..28d46bf9 100644
--- a/src/heretic/r_segs.c
+++ b/src/heretic/r_segs.c
@@ -25,6 +25,7 @@
#include <stdlib.h>
#include "doomdef.h"
+#include "i_system.h" // [crispy] I_Realloc()
#include "r_local.h"
// OPTIMIZE: closed two sided lines as single sided
--
2.20.1
no_server.patch
0001-only-draw-revealed-secret-sector-boundaries-in-gold-.patch
0002-heretic-include-i_system.h-for-I_Realloc.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment