From 9bbebcbe9e4d6ed144bed21c0cf0b37d6918f20c Mon Sep 17 00:00:00 2001
From: Shane Ellis <cobaltbw@gmail.com>
Date: Fri, 15 Jan 2021 17:55:14 -0500
Subject: [PATCH] Update d_clisrv.c
---
src/d_clisrv.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 4fdc7e7eea..4574e5a1ce 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2815,18 +2815,22 @@ static void Command_Kick(void)
return;
}
- if (!netgame) // Don't kick Tails in splitscreen!
- {
- CONS_Printf(M_GetText("This only works in a netgame.\n"));
- return;
- }
-
if (server || IsPlayerAdmin(consoleplayer))
{
UINT8 buf[3 + MAX_REASONLENGTH];
UINT8 *p = buf;
const SINT8 pn = nametonum(COM_Argv(1));
+ // Unlike bans, kicks are used especially to remove bot players, so we'll
+ // need to run a more specific check which allows kicking offline, but
+ // not against splitscreen players.
+ if (splitscreen && (pn == 0 || pn == 1))
+ {
+ CONS_Printf(M_GetText("Splitscreen players cannot be kicked.\n"));
+ return;
+ }
+
+
if (pn == -1 || pn == 0)
return;
--
GitLab