From 9f1ab11bb108513457736c89125b8aa379c0ec16 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 31 Mar 2023 16:03:52 +0100 Subject: [PATCH] UCRP_TRIGGER: Since we're not doing the custom condition string, just say the player has to "do something special on [levelname]". --- src/deh_soc.c | 4 ++-- src/m_cond.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/deh_soc.c b/src/deh_soc.c index a23ba330b..c96bbbaac 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -2763,7 +2763,7 @@ static void readcondition(UINT8 set, UINT32 id, char *word2) } else if (fastcmp(params[0], "TRIGGER")) { - PARAMCHECK(2); // strictly speaking at LEAST two + PARAMCHECK(1); ty = UCRP_TRIGGER; re = atoi(params[1]); @@ -2791,9 +2791,9 @@ static void readcondition(UINT8 set, UINT32 id, char *word2) *spos = ' '; spos = params[--i]; } -#endif stringvar = Z_StrDup(params[2]); +#endif } else if ((offset=0) || fastcmp(params[0], "FALLOFF") || (++offset && fastcmp(params[0], "TOUCHOFFROAD")) diff --git a/src/m_cond.c b/src/m_cond.c index 9fc0d0805..4d15d08ae 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -1374,7 +1374,7 @@ static const char *M_GetConditionString(condition_t *cn) G_TicsToCentiseconds(cn->requirement)); case UCRP_TRIGGER: - return cn->stringvar; + return "do something special"; case UCRP_FALLOFF: return (cn->requirement == 1) ? "fall off the course" : "without falling off";