From cbebdc219d013a54463b3e4ae074572757b1dd1c Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Tue, 21 Dec 2021 17:45:43 +0100
Subject: [PATCH] Adapt pop-up turret to UDMF
---
extras/conf/udb/Includes/SRB222_things.cfg | 4 ++++
src/p_mobj.c | 5 +----
src/p_setup.c | 3 +++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index cf6b8a875..303bfe396 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -3635,6 +3635,10 @@ udmf
sprite = "TURRI1";
width = 12;
height = 64;
+ arg0
+ {
+ title = "Firing delay";
+ }
}
122
{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index c673f3971..a3e7f8f96 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12806,10 +12806,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
return false;
break;
case MT_POPUPTURRET:
- if (mthing->angle)
- mobj->threshold = mthing->angle;
- else
- mobj->threshold = (TICRATE*2)-1;
+ mobj->threshold = mthing->args[0] ? mthing->args[0] : (TICRATE*2)-1;
break;
case MT_NIGHTSBUMPER:
// Pitch of the bumper is set in 30 degree increments.
diff --git a/src/p_setup.c b/src/p_setup.c
index ee29d6e10..e04de6e55 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4886,6 +4886,9 @@ static void P_ConvertBinaryMap(void)
case 110: //THZ Turret
mapthings[i].args[0] = LE_TURRET;
break;
+ case 111: //Pop-up Turret
+ mapthings[i].args[0] = mapthings[i].angle;
+ break;
case 754: //Push point
case 755: //Pull point
{
--
GitLab