X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_ccmds.c;h=036f4c63f1588cae58155a02479a9ec77f9ae1b7;hp=659a2815c92c58f5a4e88cdcb0e52d8fb89b8c59;hb=286d88693703cfef2443052a4612687e7125dd02;hpb=0acfd66b9cd2e309f1b383309cd26cc2aa4fa4c7

diff --git a/sv_ccmds.c b/sv_ccmds.c
index 659a2815..036f4c63 100644
--- a/sv_ccmds.c
+++ b/sv_ccmds.c
@@ -62,7 +62,7 @@ static void SV_Map_f(cmd_state_t *cmd)
 		Cvar_Set(&cvars_all, "warpmark", "");
 
 	if(host.hook.Disconnect)
-		host.hook.Disconnect();
+		host.hook.Disconnect(false, NULL);
 
 	SV_Shutdown();
 
@@ -1026,6 +1026,7 @@ static void SV_Kick_f(cmd_state_t *cmd)
 {
 	const char *who;
 	const char *message = NULL;
+	char reason[512];
 	client_t *save;
 	int i;
 	qbool byNumber = false;
@@ -1084,10 +1085,11 @@ static void SV_Kick_f(cmd_state_t *cmd)
 				message++;
 		}
 		if (message)
-			SV_ClientPrintf("Kicked by %s: %s\n", who, message);
+			SV_DropClient (false, va(reason, sizeof(reason), "Kicked by %s: %s", who, message)); // kicked
+			//SV_ClientPrintf("Kicked by %s: %s\n", who, message);
 		else
-			SV_ClientPrintf("Kicked by %s\n", who);
-		SV_DropClient (false); // kicked
+			//SV_ClientPrintf("Kicked by %s\n", who);
+			SV_DropClient (false, va(reason, sizeof(reason), "Kicked by %s", who)); // kicked
 	}
 
 	host_client = save;
@@ -1556,7 +1558,7 @@ static void SV_Ent_Remove_f(cmd_state_t *cmd)
 				return;
 		}
 
-		if(!ed->priv.required->free)
+		if(!ed->free)
 		{
 			print("Removed a \"%s\"\n", PRVM_GetString(prog, PRVM_serveredictstring(ed, classname)));
 			PRVM_ED_ClearEdict(prog, ed);
@@ -1580,7 +1582,7 @@ static void SV_Ent_Remove_All_f(cmd_state_t *cmd)
 
 	for (i = 0, rmcount = 0, ed = PRVM_EDICT_NUM(i); i < prog->num_edicts; i++, ed = PRVM_NEXT_EDICT(ed))
 	{
-		if(!ed->priv.required->free && !strcmp(PRVM_GetString(prog, PRVM_serveredictstring(ed, classname)), Cmd_Argv(cmd, 1)))
+		if(!ed->free && !strcmp(PRVM_GetString(prog, PRVM_serveredictstring(ed, classname)), Cmd_Argv(cmd, 1)))
 		{
 			if(!i)
 			{