From d58dad7f982e9486afd6945df2f223ed79abf721 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 25 Feb 2023 11:58:12 +0100
Subject: [PATCH] Move emblem float option to args[1], since args[0] is already
occupied for NiGHTS emblems
---
extras/conf/udb/Includes/SRB222_things.cfg | 2 +-
src/p_mobj.c | 5 ++++-
src/p_setup.c | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 1de661e29..b4508c91e 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -4546,7 +4546,7 @@ udmf
sprite = "EMBMA0";
width = 16;
height = 30;
- arg0
+ arg1
{
title = "Float?";
type = 11;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 635d4f42b..412ef7ddb 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11849,7 +11849,6 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
case MT_EMERHUNT:
case MT_EMERALDSPAWN:
case MT_TOKEN:
- case MT_EMBLEM:
case MT_RING:
case MT_REDTEAMRING:
case MT_BLUETEAMRING:
@@ -11861,6 +11860,10 @@ fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mt
offset += mthing->args[0] ? 0 : 24*FRACUNIT;
break;
+ case MT_EMBLEM:
+ offset += mthing->args[1] ? 0 : 24 * FRACUNIT;
+ break;
+
// Remaining objects.
default:
if (P_WeaponOrPanel(mobjtype))
diff --git a/src/p_setup.c b/src/p_setup.c
index b0054119b..1c052a148 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -6288,7 +6288,6 @@ static void P_ConvertBinaryThingTypes(void)
case 312: //Emerald token
case 320: //Emerald hunt location
case 321: //Match chaos emerald spawn
- case 322: //Emblem
case 330: //Bounce ring panel
case 331: //Rail ring panel
case 332: //Automatic ring panel
@@ -6301,6 +6300,9 @@ static void P_ConvertBinaryThingTypes(void)
case 1800: //Coin
mapthings[i].args[0] = !(mapthings[i].options & MTF_AMBUSH);
break;
+ case 322: //Emblem
+ mapthings[i].args[1] = !(mapthings[i].options & MTF_AMBUSH);
+ break;
case 409: //Extra life monitor
mapthings[i].args[2] = !(mapthings[i].options & (MTF_AMBUSH|MTF_OBJECTSPECIAL));
break;
--
GitLab