cleaned up some console stuff

2 files changed, 26 insertions, 33 deletions

diff --git a/src/engine/e_config_variables.h b/src/engine/e_config_variables.h
index c5624444..ead4b7e1 100644
--- a/src/engine/e_config_variables.h
+++ b/src/engine/e_config_variables.h
@@ -5,11 +5,9 @@
 MACRO_CONFIG_STR(player_name, 32, "nameless tee")
 MACRO_CONFIG_STR(clan_name, 32, "")
 MACRO_CONFIG_STR(password, 32, "")
-
 MACRO_CONFIG_STR(logfile, 128, "")
 
 MACRO_CONFIG_INT(cl_cpu_throttle, 0, 0, 1)
-/*MACRO_CONFIG_STR(cl_connect, 32, "")*/
 MACRO_CONFIG_INT(cl_editor, 0, 0, 1)
 
 MACRO_CONFIG_STR(b_filter_string, 64, "")
@@ -51,10 +49,8 @@ MACRO_CONFIG_STR(sv_bindaddr, 128, "")
 MACRO_CONFIG_INT(sv_port, 8303, 0, 0)
 MACRO_CONFIG_INT(sv_external_port, 0, 0, 0)
 MACRO_CONFIG_STR(sv_map, 128, "dm1")
-MACRO_CONFIG_INT(sv_map_reload, 0, 0, 1)
 MACRO_CONFIG_INT(sv_max_clients, 8, 1, 12)
 MACRO_CONFIG_INT(sv_high_bandwidth, 0, 0, 1)
-MACRO_CONFIG_INT(sv_status, 0, 0, 1)
 MACRO_CONFIG_INT(sv_register, 1, 0, 1)
 MACRO_CONFIG_STR(sv_rcon_password, 32, "")
 
@@ -65,3 +61,4 @@ MACRO_CONFIG_INT(dbg_graphs, 0, 0, 1)
 MACRO_CONFIG_INT(dbg_hitch, 0, 0, 0)
 MACRO_CONFIG_STR(dbg_stress_server, 32, "localhost")
 
+MACRO_CONFIG_INT(sv_map_reload, 0, 0, 1)
diff --git a/src/engine/server/es_server.c b/src/engine/server/es_server.c
index abf6bf21..cf747716 100644
--- a/src/engine/server/es_server.c
+++ b/src/engine/server/es_server.c
@@ -803,27 +803,6 @@ static void server_send_serverinfo(NETADDR4 *addr, int lan)
 	netserver_send(net, &packet);
 }
 
-static void server_dump_status()
-{
-	int i;
-	NETADDR4 addr;
-	dbg_msg("server", "-- status --");
-	for(i = 0; i < MAX_CLIENTS; i++)
-	{
-		if(clients[i].state == SRVCLIENT_STATE_INGAME)
-		{
-			netserver_client_addr(net, i, &addr);
-			dbg_msg("server", "id=%d addr=%d.%d.%d.%d:%d name='%s' score=%d",
-				i, addr.ip[0], addr.ip[1], addr.ip[2], addr.ip[3], addr.port,
-				clients[i].name, clients[i].score);
-		}
-	}
-	dbg_msg("server", "-- end status --");
-
-	config.sv_status = 0;
-}
-			
-
 extern int register_process_packet(NETPACKET *packet);
 extern int register_update();
 
@@ -1073,12 +1052,6 @@ static int server_run()
 				reporttime += time_freq()*reportinterval;
 			}
 			
-			if(config.sv_status)
-			{
-				server_dump_status();
-				config.sv_status = 0;
-			}
-			
 			/* wait for incomming data */
 			net_socket_read_wait(netserver_socket(net), 5);
 		}
@@ -1090,10 +1063,33 @@ static int server_run()
 	return 0;
 }
 
+static void con_kick(void *result, void *user_data)
+{
+	int cid;
+	console_result_int(result, 1, &cid);
+	server_kick(cid, "kicked by console");
+}
+
+static void con_status(void *result, void *user_data)
+{
+	int i;
+	NETADDR4 addr;
+	for(i = 0; i < MAX_CLIENTS; i++)
+	{
+		if(clients[i].state == SRVCLIENT_STATE_INGAME)
+		{
+			netserver_client_addr(net, i, &addr);
+			dbg_msg("server", "id=%d addr=%d.%d.%d.%d:%d name='%s' score=%d",
+				i, addr.ip[0], addr.ip[1], addr.ip[2], addr.ip[3], addr.port,
+				clients[i].name, clients[i].score);
+		}
+	}
+}
+
 static void server_register_commands()
 {
-	/* kick */
-	/* status */
+	MACRO_REGISTER_COMMAND("kick", "i", con_kick, 0);
+	MACRO_REGISTER_COMMAND("status", "", con_status, 0);
 }
 
 int main(int argc, char **argv)