qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-01-19 23:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

stopped some cvar and cmd clashes

Browse source
This commit is contained in:
Bill Currie 2000-02-09 09:55:58 +00:00
parent 16e636cc01
commit eef00e39f3
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/cl_main.c
View file

@ -1809,12 +1809,12 @@ void CL_Init (void)
#ifdef QUAKEWORLD
Cvar_RegisterVariable (&baseskin);
Cvar_RegisterVariable (&noskins);
#endif
//
// info mirrors
//
Cvar_RegisterVariable (&name);
#endif
Cvar_RegisterVariable (&password);
Cvar_RegisterVariable (&spectator);
Cvar_RegisterVariable (&skin);
@ -1826,7 +1826,6 @@ void CL_Init (void)
Cvar_RegisterVariable (&noaim);
Cmd_AddCommand ("version", CL_Version_f);
Cmd_AddCommand ("changing", CL_Changing_f);
// Cvar_RegisterVariable (&cl_autofire);
@ -1836,6 +1835,7 @@ void CL_Init (void)
Cmd_AddCommand ("disconnect", CL_Disconnect_f);
Cmd_AddCommand ("record", CL_Record_f);
#ifdef QUAKEWORLD
Cmd_AddCommand ("version", CL_Version_f);
Cmd_AddCommand ("rerecord", CL_ReRecord_f);
#endif
Cmd_AddCommand ("stop", CL_Stop_f);
@ -1845,16 +1845,11 @@ void CL_Init (void)
#ifdef QUAKEWORLD
Cmd_AddCommand ("skins", Skin_Skins_f);
Cmd_AddCommand ("allskins", Skin_AllSkins_f);
#endif
Cmd_AddCommand ("quit", CL_Quit_f);
#ifdef QUAKEWORLD
Cmd_AddCommand ("connect", CL_Connect_f);
#endif
Cmd_AddCommand ("reconnect", CL_Reconnect_f);
#ifdef QUAKEWORLD
Cmd_AddCommand ("rcon", CL_Rcon_f);
Cmd_AddCommand ("packet", CL_Packet_f);
Cmd_AddCommand ("user", CL_User_f);
@ -1869,14 +1864,14 @@ void CL_Init (void)
Cmd_AddCommand ("nextul", CL_NextUpload);
Cmd_AddCommand ("stopul", CL_StopUpload);
#endif
//
// forward to server commands
//
Cmd_AddCommand ("kill", NULL);
Cmd_AddCommand ("pause", NULL);
Cmd_AddCommand ("say", NULL);
Cmd_AddCommand ("say_team", NULL);
#endif
//
// forward to server commands
//
Cmd_AddCommand ("serverinfo", NULL);
//

12
uquake/host.c
View file

@ -73,8 +73,6 @@ client_t *host_client; // current client
jmp_buf host_abortserver;
//cvar_t show_fps = {"show_fps","0"}; // set for running times
extern cvar_t show_fps;
int fps_count;
@ -83,7 +81,6 @@ byte *host_basepal;
byte *host_colormap;
cvar_t host_framerate = {"host_framerate","0"}; // set for slow motion
//cvar_t host_speeds = {"host_speeds","0"}; // set for running times
extern cvar_t host_speeds;
cvar_t sys_ticrate = {"sys_ticrate","0.05"};
@ -96,12 +93,6 @@ cvar_t teamplay = {"teamplay","0",false,true};
cvar_t samelevel = {"samelevel","0"};
cvar_t noexit = {"noexit","0",false,true};
#ifdef QUAKE2
cvar_t developer = {"developer","1"}; // should be 0 for release!
#else
extern cvar_t developer;// = {"developer","0"};
#endif
cvar_t skill = {"skill","1"}; // 0 - 3
cvar_t deathmatch = {"deathmatch","0"}; // 0, 1, or 2
cvar_t coop = {"coop","0"}; // 0 or 1
@ -243,7 +234,6 @@ void Host_InitLocal (void)
Host_InitCommands ();
Cvar_RegisterVariable (&host_framerate);
Cvar_RegisterVariable (&host_speeds);
Cvar_RegisterVariable (&sys_ticrate);
Cvar_RegisterVariable (&serverprofile);
@ -254,7 +244,6 @@ void Host_InitLocal (void)
Cvar_RegisterVariable (&samelevel);
Cvar_RegisterVariable (&noexit);
Cvar_RegisterVariable (&skill);
Cvar_RegisterVariable (&developer);
Cvar_RegisterVariable (&deathmatch);
Cvar_RegisterVariable (&coop);
@ -263,7 +252,6 @@ void Host_InitLocal (void)
Cvar_RegisterVariable (&temp1);
Cvar_RegisterVariable (&sv_filter);
Cvar_RegisterVariable (&show_fps);
Host_FindMaxClients ();