From cd85240ec3d6b59b15212f4dd85a16c385cd58a9 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Sat, 17 Sep 2022 11:40:44 +0200
Subject: [PATCH] Add toggle for action 439 to use backside textures
---
extras/conf/SRB2-22.cfg | 3 ++-
extras/conf/udb/Includes/SRB222_linedefs.cfg | 8 +++++++-
src/p_setup.c | 1 +
src/p_spec.c | 3 +++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index 969f645f3f..a2f56880be 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -2481,6 +2481,7 @@ linedeftypes
prefix = "(439)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Only existing";
+ flags8192text = "[13] Use backside textures";
}
440
@@ -6949,7 +6950,7 @@ thingtypes
{
color = 10; // Green
title = "Tutorial";
-
+
799
{
title = "Tutorial Plant";
diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg
index fff9edf109..1dec9ab881 100644
--- a/extras/conf/udb/Includes/SRB222_linedefs.cfg
+++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg
@@ -2593,7 +2593,7 @@ udmf
}
}
}
-
+
190
{
title = "Rising";
@@ -4588,6 +4588,12 @@ udmf
type = 11;
enum = "yesno";
}
+ arg3
+ {
+ title = "Use backside textures?";
+ type = 11;
+ enum = "noyes";
+ }
}
440
diff --git a/src/p_setup.c b/src/p_setup.c
index 146d5d3023..a3fad52af6 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -5198,6 +5198,7 @@ static void P_ConvertBinaryLinedefTypes(void)
lines[i].args[0] = tag;
lines[i].args[1] = TMSD_FRONTBACK;
lines[i].args[2] = !!(lines[i].flags & ML_NOCLIMB);
+ lines[i].args[3] = !!(lines[i].flags & ML_EFFECT6);
break;
case 441: //Condition set trigger
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
diff --git a/src/p_spec.c b/src/p_spec.c
index 78878de1da..e8b0bcc877 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2906,6 +2906,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture;
}
+ if (line->args[3] && lines[linenum].sidenum[1] != 0xffff)
+ set = &sides[line->sidenum[1]]; // Use back side textures
+
// Back side
if (line->args[1] != TMSD_FRONT && lines[linenum].sidenum[1] != 0xffff)
{
--
GitLab