From b6f000948eddeb55c87762820415c0b997bccf8b Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 14 Nov 2018 15:28:17 +0000
Subject: [PATCH] Bugfixes: * Use CV_NOSHOWHELP as an obstacle for
 CV_CompleteVar (so the hidden variables don't show up and ruin our party or
 anything). * Hack around the karteliminatelast thing so we don't have to
 hex-edit the netids, and can release with current assets (but a different
 executable, of course, to get the credits). * Fix M_HandleConnectIP not
 saving your current position on the menu if you use it while it's empty.

---
 src/command.c | 15 ++++++++++++---
 src/m_menu.c  |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/command.c b/src/command.c
index 4533ccd89..53508667a 100644
--- a/src/command.c
+++ b/src/command.c
@@ -992,6 +992,9 @@ static consvar_t *CV_FindNetVar(UINT16 netid)
 		if (cvar->netid == netid)
 			return cvar;
 
+	if (netid == 44542) // ouch this hack
+		return &cv_karteliminatelast;
+
 	return NULL;
 }
 
@@ -1089,9 +1092,15 @@ const char *CV_CompleteVar(char *partial, INT32 skips)
 
 	// check variables
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (!strncmp(partial, cvar->name, len))
-			if (!skips--)
-				return cvar->name;
+	{
+		if (cvar->flags & CV_NOSHOWHELP)
+			continue;
+		if (strncmp(partial, cvar->name, len))
+			continue;
+		if (skips--)
+			continue;
+		return cvar->name;
+	}
 
 	return NULL;
 }
diff --git a/src/m_menu.c b/src/m_menu.c
index b9fe4ac26..c3baed5e7 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7885,6 +7885,7 @@ static void M_HandleConnectIP(INT32 choice)
 
 		case KEY_ENTER:
 			S_StartSound(NULL,sfx_menu1); // Tails
+			currentMenu->lastOn = itemOn;
 			M_ConnectIP(1);
 			break;