From 7893d08407ba5b11f5dbad213c84180ced6179c0 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Fri, 22 Dec 2023 14:23:24 +0100
Subject: [PATCH] Fix realmapnamep not being set with map * and +
---
src/g_game.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/g_game.c b/src/g_game.c
index f819cbd9ae..578dc7c6ca 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5387,17 +5387,19 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
if (mapnamelen == 1)
{
if (mapname[0] == '*') // current map
- return gamemap;
+ {
+ usemapcode = true;
+ newmapnum = gamemap;
+ }
else if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
{
+ usemapcode = true;
newmapnum = mapheaderinfo[gamemap-1]->nextlevel;
if (newmapnum < 1 || newmapnum > NUMMAPS)
{
CONS_Alert(CONS_ERROR, M_GetText("NextLevel (%d) is not a valid map.\n"), newmapnum);
return 0;
}
- else
- return newmapnum;
}
}
else if (mapnamelen == 2)/* maybe two digit code */
--
GitLab