qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-03-16 22:10:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing the new cvar mess...

Browse source
This commit is contained in:
Zephaniah E. Hull 2000-02-27 18:51:50 +00:00
parent 106dada0b2
commit 754ab06b44
9 changed files with 110 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

219
common/cl_main.c
View file

@ -1684,13 +1684,6 @@ CL_Init
*/
void CL_Init (void)
{
#ifdef QUAKEWORLD
// extern cvar_t baseskin;
extern cvar_t *baseskin;
// extern cvar_t noskins;
extern cvar_t *noskins;
#endif
#ifdef UQUAKE
SZ_Alloc (&cls.netchan.message, 1024);
#endif
@ -1714,136 +1707,11 @@ void CL_Init (void)
CL_InitCam ();
Pmove_Init ();
#endif
//
// register our commands
//
// Cvar_RegisterVariable (&show_fps);
show_fps = Cvar_Get ("show_fps","0",0,"None");
// Cvar_RegisterVariable (&host_speeds);
host_speeds = Cvar_Get ("host_speeds","0",0,"None");
// Cvar_RegisterVariable (&developer);
developer = Cvar_Get ("developer","0",0,"None");
#ifdef QUAKEWOLRD
// Cvar_RegisterVariable (&cl_warncmd);
cl_warncmd = Cvar_Get ("cl_warncmd","0",0,"None");
#endif
// Cvar_RegisterVariable (&cl_name);
cl_name = Cvar_Get ("_cl_name","player",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&cl_color);
cl_color = Cvar_Get ("_cl_color","0",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&cl_upspeed);
cl_upspeed = Cvar_Get ("cl_upspeed","200",0,"None");
// Cvar_RegisterVariable (&cl_forwardspeed);
cl_forwardspeed = Cvar_Get ("cl_forwardspeed","200",CVAR_ARCHIVE,
"None");
// Cvar_RegisterVariable (&cl_backspeed);
cl_backspeed = Cvar_Get ("cl_backspeed","200",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&cl_sidespeed);
cl_sidespeed = Cvar_Get ("cl_sidespeed","350",0,"None");
// Cvar_RegisterVariable (&cl_movespeedkey);
cl_movespeedkey = Cvar_Get ("cl_movespeedkey","2.0",0,"None");
// Cvar_RegisterVariable (&cl_yawspeed);
cl_yawspeed = Cvar_Get ("cl_yawspeed","140",0,"None");
// Cvar_RegisterVariable (&cl_pitchspeed);
cl_pitchspeed = Cvar_Get ("cl_pitchspeed","150",0,"None");
// Cvar_RegisterVariable (&cl_anglespeedkey);
cl_anglespeedkey = Cvar_Get ("cl_anglespeedkey","1.5",0,"None");
// Cvar_RegisterVariable (&cl_shownet);
cl_shownet = Cvar_Get ("cl_shownet","0",0,"None");
// Cvar_RegisterVariable (&cl_nolerp);
cl_nolerp = Cvar_Get ("cl_nolerp","0",0,"None");
// Cvar_RegisterVariable (&cl_sbar);
cl_sbar = Cvar_Get ("cl_sbar","1",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&cl_hudswap);
cl_hudswap = Cvar_Get ("cl_hudswap","1",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&cl_maxfps);
cl_maxfps = Cvar_Get ("cl_maxfps","0",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&cl_timeout);
cl_timeout = Cvar_Get ("cl_timeout","60",0,"None");
// Cvar_RegisterVariable (&lookspring);
lookspring = Cvar_Get ("lookspring","0",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&lookstrafe);
lookstrafe = Cvar_Get ("lookstrafe","0",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&sensitivity);
sensitivity = Cvar_Get ("sensitivity","3",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&m_pitch);
m_pitch = Cvar_Get ("m_pitch","0.022",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&m_yaw);
m_yaw = Cvar_Get ("m_yaw","0.022",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&m_forward);
m_forward = Cvar_Get ("m_forward","1",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&m_side);
m_side = Cvar_Get ("m_side","0.8",CVAR_ARCHIVE,"None");
// Cvar_RegisterVariable (&rcon_password);
rcon_password = Cvar_Get ("rcon_password","",0,"None");
// Cvar_RegisterVariable (&rcon_address);
rcon_address = Cvar_Get ("rcon_address","",0,"None");
// Cvar_RegisterVariable (&entlatency);
entlatency = Cvar_Get ("entlatency","20",0,"None");
// Cvar_RegisterVariable (&cl_predict_players2);
cl_predict_players2 = Cvar_Get ("cl_predict_players2","1",0,"None");
// Cvar_RegisterVariable (&cl_predict_players);
cl_predict_players = Cvar_Get ("cl_predict_players","1",0,"None");
// Cvar_RegisterVariable (&cl_solid_players);
cl_solid_players = Cvar_Get ("cl_solid_players","1",0,"None");
// Cvar_RegisterVariable (&localid);
localid = Cvar_Get ("localid","",0,"None");
#ifdef QUAKEWORLD
// Cvar_RegisterVariable (&baseskin);
baseskin = Cvar_Get ("baseskin","base",0,"None");
// Cvar_RegisterVariable (&noskins);
noskins = Cvar_Get ("noskins","0",0,"None");
//
// info mirrors
//
// Cvar_RegisterVariable (&name);
name = Cvar_Get ("name","unnamed",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,"None");
#endif
// Cvar_RegisterVariable (&password);
password = Cvar_Get ("password","",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&spectator);
spectator = Cvar_Get ("spectator","",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&skin);
skin = Cvar_Get ("skin","",CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&team);
team = Cvar_Get ("team","",CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&topcolor);
topcolor = Cvar_Get ("topcolor","0",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&bottomcolor);
bottomcolor = Cvar_Get ("bottomcolor","0",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&rate);
rate = Cvar_Get ("rate","2500",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&msg);
msg = Cvar_Get ("msg","1",CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
// Cvar_RegisterVariable (&noaim);
noaim = Cvar_Get ("noaim","0",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
Cmd_AddCommand ("changing", CL_Changing_f);
// Cvar_RegisterVariable (&cl_autofire);
#ifdef UQUAKE
Cmd_AddCommand ("entities", CL_PrintEntities_f);
#endif
@ -1896,3 +1764,88 @@ void CL_Init (void)
Cmd_AddCommand ("windows", CL_Windows_f);
#endif
}
void CL_InitCvars()
{
#ifdef QUAKEWORLD
extern cvar_t *baseskin;
extern cvar_t *noskins;
#endif
//
// register our cvars
//
show_fps = Cvar_Get ("show_fps","0",0,"None");
host_speeds = Cvar_Get ("host_speeds","0",0,"None");
developer = Cvar_Get ("developer","0",0,"None");
cl_warncmd = Cvar_Get ("cl_warncmd","0",0,"None");
cl_name = Cvar_Get ("_cl_name","player",CVAR_ARCHIVE,"None");
cl_color = Cvar_Get ("_cl_color","0",CVAR_ARCHIVE,"None");
cl_upspeed = Cvar_Get ("cl_upspeed","200",0,"None");
cl_forwardspeed = Cvar_Get ("cl_forwardspeed","200",CVAR_ARCHIVE,
"None");
cl_backspeed = Cvar_Get ("cl_backspeed","200",CVAR_ARCHIVE,"None");
cl_sidespeed = Cvar_Get ("cl_sidespeed","350",0,"None");
cl_movespeedkey = Cvar_Get ("cl_movespeedkey","2.0",0,"None");
cl_yawspeed = Cvar_Get ("cl_yawspeed","140",0,"None");
cl_pitchspeed = Cvar_Get ("cl_pitchspeed","150",0,"None");
cl_anglespeedkey = Cvar_Get ("cl_anglespeedkey","1.5",0,"None");
cl_shownet = Cvar_Get ("cl_shownet","0",0,"None");
cl_nolerp = Cvar_Get ("cl_nolerp","0",0,"None");
cl_sbar = Cvar_Get ("cl_sbar","1",CVAR_ARCHIVE,"None");
cl_hudswap = Cvar_Get ("cl_hudswap","1",CVAR_ARCHIVE,"None");
cl_maxfps = Cvar_Get ("cl_maxfps","0",CVAR_ARCHIVE,"None");
cl_timeout = Cvar_Get ("cl_timeout","60",0,"None");
lookspring = Cvar_Get ("lookspring","0",CVAR_ARCHIVE,"None");
lookstrafe = Cvar_Get ("lookstrafe","0",CVAR_ARCHIVE,"None");
sensitivity = Cvar_Get ("sensitivity","3",CVAR_ARCHIVE,"None");
m_pitch = Cvar_Get ("m_pitch","0.022",CVAR_ARCHIVE,"None");
m_yaw = Cvar_Get ("m_yaw","0.022",CVAR_ARCHIVE,"None");
m_forward = Cvar_Get ("m_forward","1",CVAR_ARCHIVE,"None");
m_side = Cvar_Get ("m_side","0.8",CVAR_ARCHIVE,"None");
rcon_password = Cvar_Get ("rcon_password","",0,"None");
rcon_address = Cvar_Get ("rcon_address","",0,"None");
entlatency = Cvar_Get ("entlatency","20",0,"None");
cl_predict_players2 = Cvar_Get ("cl_predict_players2","1",0,"None");
cl_predict_players = Cvar_Get ("cl_predict_players","1",0,"None");
cl_solid_players = Cvar_Get ("cl_solid_players","1",0,"None");
localid = Cvar_Get ("localid","",0,"None");
#ifdef QUAKEWORLD
baseskin = Cvar_Get ("baseskin","base",0,"None");
noskins = Cvar_Get ("noskins","0",0,"None");
//
// info mirrors
//
name = Cvar_Get ("name","unnamed",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,"None");
#endif
password = Cvar_Get ("password","",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
spectator = Cvar_Get ("spectator","",CVAR_USERINFO|CVAR_SERVERINFO,
"None");
skin = Cvar_Get ("skin","",CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
team = Cvar_Get ("team","",CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
topcolor = Cvar_Get ("topcolor","0",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
bottomcolor = Cvar_Get ("bottomcolor","0",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
rate = Cvar_Get ("rate","2500",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
msg = Cvar_Get ("msg","1",CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
noaim = Cvar_Get ("noaim","0",
CVAR_ARCHIVE|CVAR_USERINFO|CVAR_SERVERINFO,
"None");
}

3
common/client.h
View file

@ -359,8 +359,8 @@ extern cvar_t *cl_color;
extern cvar_t *cl_autofire;
extern cvar_t *cl_nolerp;
#endif // UQUAKE
#ifdef QUAKEWORLD
extern cvar_t *cl_warncmd;
#ifdef QUAKEWORLD
extern cvar_t *name;
#endif // QUAKEWORLD
extern cvar_t *rate;
@ -422,6 +422,7 @@ dlight_t *CL_AllocDlight (int key);
void CL_DecayLights (void);
void CL_Init (void);
void CL_InitCvars();
void Host_WriteConfiguration (void);
void CL_EstablishConnection (char *host);

5
common/cvar.c
View file

@ -284,7 +284,7 @@ void Cvar_Shutdown (void)
{
next = var->next;
free(var->description);
free(var->string);
Z_Free(var->string);
free(var->name);
free(var);
var = next;
@ -310,7 +310,8 @@ cvar_t *Cvar_Get(char *name, char *string, int cvarflags, char *description)
v->next = cvar_vars;
cvar_vars = v;
v->name = strdup(name);
v->string = strdup(string);
v->string = Z_Malloc (Q_strlen(string)+1);
Q_strcpy (v->string, string);
v->flags = cvarflags;
v->description = strdup(description);
v->value = Q_atof (v->string);

5
common/host.c
View file

@ -224,11 +224,15 @@ Host_FilterTime ( float time )
host_frametime = realtime - oldrealtime;
oldrealtime = realtime;
#ifdef UQUAKE
if (host_framerate->value > 0) {
host_frametime = host_framerate->value;
} else { // don't allow really long or short frames
#endif
host_frametime = min(MAXTIME, max(host_frametime, MINTIME));
#ifdef UQUAKE
}
#endif
return true;
}
@ -543,6 +547,7 @@ Host_Init ( quakeparms_t *parms)
Sys_Error ("Only %4.1fMB of memory reported, can't execute game", parms->memsize / (float) 0x100000);
Memory_Init (parms->membase, parms->memsize);
CL_InitCvars();
Cbuf_Init ();
Cmd_Init ();
V_Init ();

9
common/quakefs.c
View file

@ -346,14 +346,9 @@ int COM_FOpenFile (char *filename, QFile **gzfile)
#endif
if (fn)
{ // found it!
if(developer->value)
if (developer->value)
Sys_Printf ("PackFile: %s : %s\n",pak->filename, fn);
// open a new file on the pakfile
//*file = fopen (pak->filename, "rb");
//if (!*file)
// Sys_Error ("Couldn't reopen %s", pak->filename);
//fseek (*file, pak->files[i].filepos, SEEK_SET);
//com_filesize = pak->files[i].filelen;
// open a new file on the pakfile
*gzfile=COM_OpenRead(pak->filename,pak->files[i].filepos,
pak->files[i].filelen);
file_from_pak = 1;

3
common/r_main.c
View file

@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <cmd.h>
#include <sys.h>
#include <console.h>
#include <cvars.h>
//#define PASSAGES
@ -297,6 +298,8 @@ void R_Init (void)
// Cvar_RegisterVariable (&r_aliastransadj);
r_aliastransadj = Cvar_Get ("r_aliastransadj","100",0,"None");
gl_flashblend = Cvar_Get ("gl_flashblend","1",0,"None");
r_maxedges->value = (float)NUMSTACKEDGES;
r_maxsurfs->value = (float)NUMSTACKSURFACES;

9
common/sys_linux.c
View file

@ -60,9 +60,6 @@ int noconinput = 0;
char *basedir = ".";
char *cachedir = "/tmp";
//cvar_t sys_linerefresh = {"sys_linerefresh","0"};// set for entity display
cvar_t *sys_linerefresh;
// =======================================================================
// General routines
// =======================================================================
@ -224,9 +221,6 @@ void alarm_handler(int x) {
oktogo=1;
}
void Sys_LineRefresh(void) {
}
void floating_point_exception_handler(int whatever) {
// Sys_Warn("floating point exception\n");
signal(SIGFPE, floating_point_exception_handler);
@ -338,9 +332,6 @@ int main (int c, char **v) {
oldtime = newtime;
#endif
Host_Frame(time);
// graphic debugging aids
if (sys_linerefresh->value)
Sys_LineRefresh ();
}
}

7
configure.in
View file

@ -7,6 +7,7 @@ QF_VERSION=0.2-d
VERSION=2.40
AC_DEFINE_UNQUOTED(QF_VERSION,"$QF_VERSION")
AC_DEFINE_UNQUOTED(VERSION,"$VERSION")
LIBS=-lefence
dnl Set to yes for releases
RELEASE=no
@ -477,7 +478,7 @@ dnl CFLAGS for release and devel versions
if test "x$RELEASE" = xyes; then
if test "x$GCC" = xyes; then
AC_MSG_CHECKING(for special release compiler settings)
BASE_RELEASE_CFLAGS="-lefence -Wall -Werror -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations"
BASE_RELEASE_CFLAGS="-Wall -Werror -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations"
case "${target}" in
changequote(,)dnl
i?86-*-*)
@ -508,7 +509,7 @@ if test "x$GCC" != xyes; then
AC_MSG_CHECKING(for how to deal with C++ comments)
case "$target" in
*-aix*)
CFLAGS="-lefence $CFLAGS -qcpluscmt"
CFLAGS="$CFLAGS -qcpluscmt"
AC_MSG_RESULT([-qcpluscmt])
;;
*-irix6*)
@ -527,7 +528,7 @@ fi
dnl We want warnings, lots of warnings...
if test "x$GCC" = xyes; then
CFLAGS="-lefence $CFLAGS -Wall -Werror"
CFLAGS="$CFLAGS -Wall -Werror"
fi
# CFLAGS="$CFLAGS -Wall -pedantic"

5
qw_client/view.c
View file

@ -889,6 +889,11 @@ void V_Init (void)
Cmd_AddCommand ("bf", V_BonusFlash_f);
Cmd_AddCommand ("centerview", V_StartPitchDrift);
// Cvar_RegisterVariable (&lcd_x);
lcd_x = Cvar_Get ("lcd_x","0",0,"None");
// Cvar_RegisterVariable (&lcd_yaw);
//lcd_yaw = Cvar_Get ("lcd_yaw","0",0,"None");
// Cvar_RegisterVariable (&v_centermove);
v_centermove = Cvar_Get ("v_centermove","0.15",0,"None");
// Cvar_RegisterVariable (&v_centerspeed);