From c8ae28bbaf3a16ca445647da47968573078507e9 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Tue, 1 Dec 2020 18:35:24 +0100
Subject: [PATCH] Follow GZDoom's convention for stringargs.
---
src/p_setup.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index 918ffbd4e6..e02cb34aae 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1628,9 +1628,9 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
return;
lines[i].args[argnum] = atol(val);
}
- else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9)
+ else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
{
- size_t argnum = param[9] - '0';
+ size_t argnum = param[3] - '0';
if (argnum >= NUMLINESTRINGARGS)
return;
lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
@@ -1727,9 +1727,9 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
return;
mapthings[i].args[argnum] = atol(val);
}
- else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9)
+ else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
{
- size_t argnum = param[9] - '0';
+ size_t argnum = param[3] - '0';
if (argnum >= NUMMAPTHINGSTRINGARGS)
return;
mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
--
GitLab