From af30847a1f8b8d33892d1e11684702088104b2f6 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Tue, 21 Dec 2021 18:19:10 +0100
Subject: [PATCH] Adapt zoom tube waypoint to UDMF
---
extras/conf/udb/Includes/SRB222_things.cfg | 8 ++++++++
src/p_mobj.c | 4 ++--
src/p_setup.c | 4 ++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 303bfe3969..03c2fc82d2 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -4773,6 +4773,14 @@ udmf
{
title = "Zoom Tube Waypoint";
sprite = "internal:zoom";
+ arg0
+ {
+ title = "Sequence";
+ }
+ arg1
+ {
+ title = "Order";
+ }
}
754
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 65c337cf2b..7f12a190b8 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12819,8 +12819,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
break;
case MT_TUBEWAYPOINT:
{
- UINT8 sequence = mthing->angle >> 8;
- UINT8 id = mthing->angle & 255;
+ UINT8 sequence = mthing->args[0];
+ UINT8 id = mthing->args[1];
mobj->health = id;
mobj->threshold = sequence;
P_AddWaypoint(sequence, id, mobj);
diff --git a/src/p_setup.c b/src/p_setup.c
index ba3544d120..bf12c88bcb 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4890,6 +4890,10 @@ static void P_ConvertBinaryMap(void)
case 111: //Pop-up Turret
mapthings[i].args[0] = mapthings[i].angle;
break;
+ case 753: //Zoom tube waypoint
+ mapthings[i].args[0] = mapthings[i].angle >> 8;
+ mapthings[i].args[1] = mapthings[i].angle & 255;
+ break;
case 754: //Push point
case 755: //Pull point
{
--
GitLab