From: cloudwalk Date: Sun, 21 Jun 2020 19:54:46 +0000 (+0000) Subject: Merge Cmd_Init_Commands into Cmd_Init X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97b8c604395db48367cb95eb4915dfee96773260;p=xonotic%2Fdarkplaces.git Merge Cmd_Init_Commands into Cmd_Init git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12710 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/cmd.c b/cmd.c index f3d0a1cb..f7d84dc2 100644 --- a/cmd.c +++ b/cmd.c @@ -1518,10 +1518,7 @@ void Cmd_Init(void) cmd_serverfromclient.cvars_flagsmask = 0; cmd_serverfromclient.cmd_flags = CMD_SERVER_FROM_CLIENT; cmd_serverfromclient.userdefined = &cmd_userdefined_null; -} -void Cmd_Init_Commands(qboolean dedicated_server) -{ // // register our commands // diff --git a/cmd.h b/cmd.h index 8badf436..4ada5896 100644 --- a/cmd.h +++ b/cmd.h @@ -151,8 +151,6 @@ extern qboolean host_stuffcmdsrun; void Cbuf_Lock(cmd_state_t *cmd); void Cbuf_Unlock(cmd_state_t *cmd); -void Cmd_Init_Commands(qboolean dedicated_server); - /*! as new commands are generated from the console or keybindings, * the text is added to the end of the command buffer. */ diff --git a/host.c b/host.c index a50e5a27..1b935c7e 100644 --- a/host.c +++ b/host.c @@ -1160,7 +1160,6 @@ static void Host_Init (void) int i; const char* os; char vabuf[1024]; - qboolean dedicated_server = COM_CheckParm("-dedicated") || !cl_available; cmd_state_t *cmd = &cmd_client; host.state = host_init; @@ -1214,8 +1213,6 @@ static void Host_Init (void) // initialize console command/cvar/alias/command execution systems Cmd_Init(); - Cmd_Init_Commands(dedicated_server); - // initialize memory subsystem cvars/commands Memory_Init_Commands();