From 404f3c13e4ed1d9e1a375bba1c2ae59b4f694e0e Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 29 Dec 2019 02:31:14 -0800
Subject: [PATCH] If we move the -warp code down, map searching can be used
---
src/d_main.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index c4b0d7117e..c83c4ccc89 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1118,26 +1118,6 @@ void D_SRB2Main(void)
if (M_CheckParm("-server") || dedicated)
netgame = server = true;
- if (M_CheckParm("-warp") && M_IsNextParm())
- {
- const char *word = M_GetNextParm();
- char ch; // use this with sscanf to catch non-digits with
- if (fastncmp(word, "MAP", 3)) // MAPxx name
- pstartmap = M_MapNumber(word[3], word[4]);
- else if (sscanf(word, "%d%c", &pstartmap, &ch) != 1) // a plain number
- I_Error("Cannot warp to map %s (invalid map name)\n", word);
- // Don't check if lump exists just yet because the wads haven't been loaded!
- // Just do a basic range check here.
- if (pstartmap < 1 || pstartmap > NUMMAPS)
- I_Error("Cannot warp to map %d (out of range)\n", pstartmap);
- else
- {
- if (!M_CheckParm("-server"))
- G_SetGameModified(true);
- autostart = true;
- }
- }
-
CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
Z_Init();
@@ -1194,6 +1174,20 @@ void D_SRB2Main(void)
mainwadstally = packetsizetally; // technically not accurate atm, remember to port the two-stage -file process from kart in 2.2.x
+ if (M_CheckParm("-warp") && M_IsNextParm())
+ {
+ const char *word = M_GetNextParm();
+ pstartmap = G_FindMapByNameOrCode(word, 0);
+ if (! pstartmap)
+ I_Error("Cannot find a map remotely named '%s'\n", word);
+ else
+ {
+ if (!M_CheckParm("-server"))
+ G_SetGameModified(true);
+ autostart = true;
+ }
+ }
+
cht_Init();
//---------------------------------------------------- READY SCREEN
--
GitLab