CL_ClientMovement_Physics_Walk(s);
}
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
void CL_UpdateMoveVars(void)
{
if (cls.protocol == PROTOCOL_QUAKEWORLD)
else
{
cl.moveflags = 0;
- cl.movevars_ticrate = (cls.demoplayback ? 1.0f : slowmo.value) / bound(1.0f, cl_netfps.value, 1000.0f);
- cl.movevars_timescale = (cls.demoplayback ? 1.0f : slowmo.value);
+ cl.movevars_ticrate = (cls.demoplayback ? 1.0f : host_timescale.value) / bound(1.0f, cl_netfps.value, 1000.0f);
+ cl.movevars_timescale = (cls.demoplayback ? 1.0f : host_timescale.value);
cl.movevars_gravity = sv_gravity.value;
cl.movevars_stopspeed = cl_movement_stopspeed.value;
cl.movevars_maxspeed = cl_movement_maxspeed.value;
return true;
}
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
extern cvar_t cl_lerpexcess;
static void CL_NetworkTimeReceived(double newtime)
{
int count;
qboolean ispattern;
char vabuf[1024];
+ char *cvar_name;
if (Cmd_Argc(cmd) > 1)
partial = Cmd_Args(cmd);
count = 0;
for (cvar = cmd->cvars->vars; cvar; cvar = cvar->next)
{
- if (!matchpattern_with_separator(cvar->name, partial, true, "", false))
- if (!matchpattern_with_separator(cvar->description, partial, true, "", false))
+ if (!matchpattern_with_separator(cvar->name, partial, true, "", false) &&
+ !matchpattern_with_separator(cvar->description, partial, true, "", false))
+ {
+ for (int i = 0; i < cvar->aliasindex; i++)
+ {
+ if (!matchpattern_with_separator(cvar->aliases[i], partial, true, "", false)) {
+ continue;
+ } else {
+ cvar_name = cvar->aliases[i];
+ goto print;
+ }
+ }
continue;
+ } else {
+ cvar_name = (char *)cvar->name;
+ break;
+ }
+print:
Con_Printf ("cvar ");
- Cvar_PrintHelp(cvar, true);
+ Cvar_PrintHelp(cvar, cvar_name, true);
count++;
}
for (func = cmd->userdefined->csqc_functions; func; func = func->next)
cvar_t *Cvar_FindVar(cvar_state_t *cvars, const char *var_name, int neededflags)
{
int hashindex;
- cvar_t *var;
+ cvar_hash_t *hash;
// use hash lookup to minimize search time
hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE;
- for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
- if (!strcmp (var_name, var->name) && (var->flags & neededflags))
- return var;
-
+ for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
+ if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
+ return hash->cvar;
+ else
+ for (int i = 0; i < hash->cvar->aliasindex; i++)
+ if (!strcmp (var_name, hash->cvar->aliases[i]) && (hash->cvar->flags & neededflags))
+ return hash->cvar;
return NULL;
}
return var;
}
-static cvar_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_t **parent, cvar_t ***link, cvar_t **prev_alpha, int neededflags)
+static cvar_hash_t *Cvar_FindVarLink(cvar_state_t *cvars, const char *var_name, cvar_hash_t **parent, cvar_hash_t ***link, cvar_t **prev_alpha, int neededflags)
{
int hashindex;
- cvar_t *var;
+ cvar_hash_t *hash;
// use hash lookup to minimize search time
hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name));
if(parent) *parent = NULL;
if(prev_alpha) *prev_alpha = NULL;
if(link) *link = &cvars->hashtable[hashindex];
- for (var = cvars->hashtable[hashindex];var;var = var->nextonhashchain)
+ for (hash = cvars->hashtable[hashindex];hash;hash = hash->next)
{
- if (!strcmp (var_name, var->name) && (var->flags & neededflags))
- {
- if(!prev_alpha || var == cvars->vars)
- return var;
-
- *prev_alpha = cvars->vars;
- // if prev_alpha happens to become NULL then there has been some inconsistency elsewhere
- // already - should I still insert '*prev_alpha &&' in the loop?
- while((*prev_alpha)->next != var)
- *prev_alpha = (*prev_alpha)->next;
- return var;
- }
- if(parent) *parent = var;
+ if (!strcmp (var_name, hash->cvar->name) && (hash->cvar->flags & neededflags))
+ goto match;
+ else
+ for (int i = 0; i < hash->cvar->aliasindex; i++)
+ if (!strcmp (var_name, hash->cvar->aliases[i]) && (hash->cvar->flags & neededflags))
+ goto match;
+ if(parent) *parent = hash;
}
-
- return NULL;
+ return NULL;
+match:
+ if(!prev_alpha || hash->cvar == cvars->vars)
+ return hash;
+
+ *prev_alpha = cvars->vars;
+ // if prev_alpha happens to become NULL then there has been some inconsistency elsewhere
+ // already - should I still insert '*prev_alpha &&' in the loop?
+ while((*prev_alpha)->next != hash->cvar)
+ *prev_alpha = (*prev_alpha)->next;
+ return hash;
}
/*
for (cvar = cvars->vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
h++;
-
+ else
+ for(int i = 0; i < cvar->aliasindex; i++)
+ if (!strncasecmp(partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+ h++;
+
return h;
}
for (cvar = cvars->vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
buf[bpos++] = cvar->name;
+ else
+ for(int i = 0; i < cvar->aliasindex; i++)
+ if (!strncasecmp(partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+ buf[bpos++] = cvar->aliases[i];
+
buf[bpos] = NULL;
return buf;
}
-void Cvar_PrintHelp(cvar_t *cvar, qboolean full)
+void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full)
{
- Con_Printf("^3%s^7 is \"%s\" [\"%s\"] ", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+ Con_Printf("^3%s^7", name);
+ if (strcmp(cvar->name, name))
+ Con_Printf(" (now ^3%s^7)", cvar->name);
+ Con_Printf(" is \"%s\" [\"%s\"] ", ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring);
+
if (full)
Con_Printf("%s", cvar->description);
Con_Printf("\n");
// Loop through the command list and print all matches
for (cvar = cvars->vars; cvar; cvar = cvar->next)
if (!strncasecmp(partial, cvar->name, len) && (cvar->flags & neededflags))
- Cvar_PrintHelp(cvar, true);
+ Cvar_PrintHelp(cvar, cvar->name, true);
+ else
+ for (int i = 0; i < cvar->aliasindex; i++)
+ if (!strncasecmp (partial, cvar->aliases[i], len) && (cvar->flags & neededflags))
+ Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+
+
}
// check if a cvar is held by some progs
variable->callback = callback;
}
+void Cvar_RegisterAlias(cvar_t *variable, const char *alias )
+{
+ cvar_state_t *cvars = &cvars_all;
+ cvar_hash_t *hash;
+ int hashindex;
+
+ variable->aliases = (char **)Mem_Realloc(zonemempool, variable->aliases, sizeof(char *) * (variable->aliasindex + 1));
+ // Add to it
+ variable->aliases[variable->aliasindex] = (char *)Z_Malloc(strlen(alias) + 1);
+ memcpy(variable->aliases[variable->aliasindex], alias, strlen(alias) + 1);
+ variable->aliasindex++;
+
+ // link to head of list in this hash table index
+ hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
+ hashindex = CRC_Block((const unsigned char *)alias, strlen(alias)) % CVAR_HASHSIZE;
+ hash->next = cvars->hashtable[hashindex];
+ cvars->hashtable[hashindex] = hash;
+ hash->cvar = variable;
+}
+
/*
============
Cvar_RegisterVariable
{
cvar_state_t *cvars = NULL;
int hashindex;
+ cvar_hash_t *hash;
cvar_t *current, *next, *cvar;
char *oldstr;
size_t alloclen;
memcpy ((char *)variable->defstring, oldstr, alloclen);
variable->value = atof (variable->string);
variable->integer = (int) variable->value;
+ variable->aliasindex = 0;
// Mark it as not an autocvar.
for (i = 0;i < PRVM_PROG_MAX;i++)
variable->next = next;
// link to head of list in this hash table index
+ hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE;
- variable->nextonhashchain = cvars->hashtable[hashindex];
- cvars->hashtable[hashindex] = variable;
+ hash->next = cvars->hashtable[hashindex];
+ hash->cvar = variable;
+ cvars->hashtable[hashindex] = hash;
}
/*
cvar_t *Cvar_Get(cvar_state_t *cvars, const char *name, const char *value, int flags, const char *newdescription)
{
int hashindex;
+ cvar_hash_t *hash;
cvar_t *current, *next, *cvar;
int i;
cvar->defstring = (char *)Mem_strdup(zonemempool, value);
cvar->value = atof (cvar->string);
cvar->integer = (int) cvar->value;
+ cvar->aliases = (char **)Z_Malloc(sizeof(char **));
+ memset(cvar->aliases, 0, sizeof(char *));
if(newdescription && *newdescription)
cvar->description = (char *)Mem_strdup(zonemempool, newdescription);
cvar->next = next;
// link to head of list in this hash table index
+ hash = (cvar_hash_t *)Z_Malloc(sizeof(cvar_hash_t));
hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE;
- cvar->nextonhashchain = cvars->hashtable[hashindex];
- cvars->hashtable[hashindex] = cvar;
+ hash->next = cvars->hashtable[hashindex];
+ cvars->hashtable[hashindex] = hash;
+ hash->cvar = cvar;
return cvar;
}
+qboolean Cvar_Readonly (cvar_t *var, const char *cmd_name)
+{
+ if (var->flags & CVAR_READONLY)
+ {
+ if(cmd_name)
+ Con_Printf("%s: ",cmd_name);
+ Con_Printf("%s", var->name);
+ Con_Printf(" is read-only\n");
+ return true;
+ }
+ return false;
+}
/*
============
cvar_t *v;
// check variables
- v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), cmd->cvars_flagsmask);
+ v = Cvar_FindVar(cvars, Cmd_Argv(cmd, 0), (cmd->cvars_flagsmask));
if (!v)
return false;
// perform a variable print or set
if (Cmd_Argc(cmd) == 1)
{
- Cvar_PrintHelp(v, true);
+ Cvar_PrintHelp(v, Cmd_Argv(cmd, 0), true);
return true;
}
if (developer_extra.integer)
Con_DPrint("Cvar_Command: ");
-
- if (v->flags & CVAR_READONLY)
- {
- Con_Printf("%s is read-only\n", v->name);
+
+ if(Cvar_Readonly(v, NULL))
return true;
- }
+
Cvar_SetQuick(v, Cmd_Argv(cmd, 1));
if (developer_extra.integer)
Con_DPrint("\n");
Con_DPrintf("Cvar_RestoreInitState: Destroying cvar \"%s\"\n", c->name);
// unlink struct from hash
hashindex = CRC_Block((const unsigned char *)c->name, strlen(c->name)) % CVAR_HASHSIZE;
- for (cp2 = &cvars->hashtable[hashindex];(c2 = *cp2);)
+ for (cp2 = &cvars->hashtable[hashindex]->cvar;(c2 = *cp2);)
{
if (c2 == c)
{
- *cp2 = c2->nextonhashchain;
+ *cp2 = cvars->hashtable[hashindex]->next->cvar;
break;
}
else
- cp2 = &c2->nextonhashchain;
+ cp2 = &cvars->hashtable[hashindex]->next->cvar;
}
// unlink struct from main list
*cp = c->next;
cvar_t *var;
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
+ {
if((var->flags & CVAR_NORESETTODEFAULTS) == 0)
Cvar_SetQuick(var, var->defstring);
+ }
}
cvar_t *var;
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
+ {
if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0)
Cvar_SetQuick(var, var->defstring);
+ }
}
cvar_t *var;
// restore the default values of all cvars
for (var = cvars->vars ; var ; var = var->next)
+ {
if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE)
Cvar_SetQuick(var, var->defstring);
+ }
}
char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE];
// don't save cvars that match their default value
- for (var = cvars->vars ; var ; var = var->next)
+ for (var = cvars->vars ; var ; var = var->next) {
if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || ((var->flags & CVAR_ALLOCATED) && !(var->flags & CVAR_DEFAULTSET))))
{
Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$", false);
Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$", false);
FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2);
}
+ }
}
if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len)))
continue;
- Cvar_PrintHelp(cvar, true);
+ Cvar_PrintHelp(cvar, cvar->name, true);
count++;
}
// check if it's read-only
cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("Set: %s is read-only\n", cvar->name);
- return;
- }
+ if (cvar)
+ if(Cvar_Readonly(cvar,"Set"))
+ return;
if (developer_extra.integer)
Con_DPrint("Set: ");
// check if it's read-only
cvar = Cvar_FindVar(cvars, Cmd_Argv(cmd, 1), ~0);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("SetA: %s is read-only\n", cvar->name);
- return;
- }
+ if (cvar)
+ if(Cvar_Readonly(cvar,"SetA"))
+ return;
if (developer_extra.integer)
Con_DPrint("SetA: ");
cvar_state_t *cvars = cmd->cvars;
int neededflags = ~0;
int i;
- cvar_t *cvar, *parent, **link, *prev;
+ cvar_hash_t *hash, *parent, **link;
+ cvar_t *cvar, *prev;
if(Cmd_Argc(cmd) < 2)
{
}
for(i = 1; i < Cmd_Argc(cmd); ++i)
{
- cvar = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
+ hash = Cvar_FindVarLink(cvars, Cmd_Argv(cmd, i), &parent, &link, &prev, neededflags);
+ cvar = hash->cvar;
+
if(!cvar)
{
Con_Printf("%s: %s is not defined\n", Cmd_Argv(cmd, 0), Cmd_Argv(cmd, i));
continue;
}
- if(cvar->flags & CVAR_READONLY)
- {
- Con_Printf("%s: %s is read-only\n", Cmd_Argv(cmd, 0), cvar->name);
+ if(Cvar_Readonly(cvar, Cmd_Argv(cmd, 0)))
continue;
- }
if(!(cvar->flags & CVAR_ALLOCATED))
{
Con_Printf("%s: %s is static and cannot be deleted\n", Cmd_Argv(cmd, 0), cvar->name);
}
if(parent)
- parent->nextonhashchain = cvar->nextonhashchain;
+ parent->next = hash->next;
else if(link)
- *link = cvar->nextonhashchain;
-
+ *link = hash->next;
if(cvar->description != cvar_dummy_description)
Z_Free((char *)cvar->description);
void (*callback)(char *value);
+ char **aliases;
+ int aliasindex;
+
// values at init (for Cvar_RestoreInitState)
qboolean initstate; // indicates this existed at init
int initflags;
//menucvar_t menuinfo;
struct cvar_s *next;
- struct cvar_s *nextonhashchain;
} cvar_t;
+typedef struct cvar_hash_s
+{
+ cvar_t *cvar;
+ struct cvar_hash_s *next;
+} cvar_hash_t;
+
typedef struct cvar_state_s
{
cvar_t *vars;
- cvar_t *hashtable[CVAR_HASHSIZE];
+ cvar_hash_t *hashtable[CVAR_HASHSIZE];
}
cvar_state_t;
void Cvar_MenuOption(cvar_t *variable, int menu, int value[16], const char *name[16]);
*/
-/// registers a cvar that already has the name, string, and optionally the
-/// archive elements set.
+
+void Cvar_RegisterAlias(cvar_t *variable, const char *alias );
+
void Cvar_RegisterCallback(cvar_t *variable, void (*callback)(char *));
+/// registers a cvar that already has the name, string, and optionally the
+/// archive elements set.
void Cvar_RegisterVariable(cvar_t *variable);
+qboolean Cvar_Readonly (cvar_t *var, const char *cmd_name);
+
/// equivelant to "<name> <variable>" typed at the console
void Cvar_Set (cvar_state_t *cvars, const char *var_name, const char *value);
// attempts to match a partial variable name for command line completion
// returns NULL if nothing fits
-void Cvar_PrintHelp(cvar_t *cvar, qboolean full);
+void Cvar_PrintHelp(cvar_t *cvar, const char *name, qboolean full);
void Cvar_CompleteCvarPrint (cvar_state_t *cvars, const char *partial, int neededflags);
framelimit = cl_maxphysicsframesperserverframe.integer;
aborttime = Sys_DirtyTime() + 0.1;
}
- if(slowmo.value > 0 && slowmo.value < 1)
- advancetime = min(advancetime, 0.1 / slowmo.value);
+ if(host_timescale.value > 0 && host_timescale.value < 1)
+ advancetime = min(advancetime, 0.1 / host_timescale.value);
else
advancetime = min(advancetime, 0.1);
// only advance time if not paused
// the game also pauses in singleplayer when menu or console is used
- sv.frametime = advancetime * slowmo.value;
+ sv.frametime = advancetime * host_timescale.value;
if (host_framerate.value)
sv.frametime = host_framerate.value;
if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
// scale playback speed of demos by slowmo cvar
if (cls.demoplayback)
{
- clframetime *= slowmo.value;
+ clframetime *= host_timescale.value;
// if demo playback is paused, don't advance time at all
if (cls.demopaused)
clframetime = 0;
continue;
}
#ifndef STANDALONETEST
- if (cl_netlocalping.value && (realtime - cl_netlocalping.value * (1.0 / 2000.0)) < p->sentdoubletime)
+ if (net_fakelag.value && (realtime - net_fakelag.value * (1.0 / 2000.0)) < p->sentdoubletime)
continue;
#endif
if (value == 0 && p->destinationport == lhnetsocket->address.port)
m_entersound = true;
}
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
extern dllhandle_t jpeg_dll;
extern cvar_t gl_texture_anisotropy;
extern cvar_t r_textshadow;
Cvar_SetValueQuick (&cl_backspeed, 400);
}
}
- else if (options_cursor == optnum++) Cvar_SetValueQuick(&showfps, !showfps.integer);
- else if (options_cursor == optnum++) {f = !(showdate.integer && showtime.integer);Cvar_SetValueQuick(&showdate, f);Cvar_SetValueQuick(&showtime, f);}
+ else if (options_cursor == optnum++) Cvar_SetValueQuick(&cl_showfps, !cl_showfps.integer);
+ else if (options_cursor == optnum++) {f = !(cl_showdate.integer && cl_showtime.integer);Cvar_SetValueQuick(&cl_showdate, f);Cvar_SetValueQuick(&cl_showtime, f);}
else if (options_cursor == optnum++) ;
else if (options_cursor == optnum++) Cvar_SetValueQuick(&r_hdr_scenebrightness, bound(1, r_hdr_scenebrightness.value + dir * 0.0625, 4));
else if (options_cursor == optnum++) Cvar_SetValueQuick(&v_contrast, bound(1, v_contrast.value + dir * 0.0625, 4));
M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0);
M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170);
M_Options_PrintCheckbox(" Always Run", true, cl_forwardspeed.value > 200);
- M_Options_PrintCheckbox(" Show Framerate", true, showfps.integer);
- M_Options_PrintCheckbox(" Show Date and Time", true, showdate.integer && showtime.integer);
+ M_Options_PrintCheckbox(" Show Framerate", true, cl_showfps.integer);
+ M_Options_PrintCheckbox(" Show Date and Time", true, cl_showdate.integer && cl_showtime.integer);
M_Options_PrintCommand( " Custom Brightness", true);
M_Options_PrintSlider( " Game Brightness", true, r_hdr_scenebrightness.value, 1, 4);
M_Options_PrintSlider( " Brightness", true, v_contrast.value, 1, 2);
cvar_t hostname = {CVAR_SERVER | CVAR_SAVE, "hostname", "UNNAMED", "server message to show in server browser"};
cvar_t developer_networking = {CVAR_CLIENT | CVAR_SERVER, "developer_networking", "0", "prints all received and sent packets (recommended only for debugging)"};
-cvar_t cl_netlocalping = {CVAR_CLIENT, "cl_netlocalping","0", "lags local loopback connection by this much ping time (useful to play more fairly on your own server with people with higher pings)"};
-static cvar_t cl_netpacketloss_send = {CVAR_CLIENT, "cl_netpacketloss_send","0", "drops this percentage of outgoing packets, useful for testing network protocol robustness (jerky movement, prediction errors, etc)"};
-static cvar_t cl_netpacketloss_receive = {CVAR_CLIENT, "cl_netpacketloss_receive","0", "drops this percentage of incoming packets, useful for testing network protocol robustness (jerky movement, effects failing to start, sounds failing to play, etc)"};
+cvar_t net_fakelag = {CVAR_CLIENT, "net_fakelag","0", "lags local loopback connection by this much ping time (useful to play more fairly on your own server with people with higher pings)"};
+static cvar_t net_fakeloss_send = {CVAR_CLIENT, "net_fakeloss_send","0", "drops this percentage of outgoing packets, useful for testing network protocol robustness (jerky movement, prediction errors, etc)"};
+static cvar_t net_fakeloss_receive = {CVAR_CLIENT, "net_fakeloss_receive","0", "drops this percentage of incoming packets, useful for testing network protocol robustness (jerky movement, effects failing to start, sounds failing to play, etc)"};
static cvar_t net_slist_queriespersecond = {CVAR_CLIENT, "net_slist_queriespersecond", "20", "how many server information requests to send per second"};
static cvar_t net_slist_queriesperframe = {CVAR_CLIENT, "net_slist_queriesperframe", "4", "maximum number of server information requests to send each rendered frame (guards against low framerates causing problems)"};
static cvar_t net_slist_timeout = {CVAR_CLIENT, "net_slist_timeout", "4", "how long to listen for a server information response before giving up"};
Thread_UnlockMutex(netconn_mutex);
if (length == 0)
return 0;
- if (cl_netpacketloss_receive.integer)
+ if (net_fakeloss_receive.integer)
for (i = 0;i < cl_numsockets;i++)
- if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss_receive.integer)
+ if (cl_sockets[i] == mysocket && (rand() % 100) < net_fakeloss_receive.integer)
return 0;
if (developer_networking.integer)
{
{
int ret;
int i;
- if (cl_netpacketloss_send.integer)
+ if (net_fakeloss_send.integer)
for (i = 0;i < cl_numsockets;i++)
- if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss_send.integer)
+ if (cl_sockets[i] == mysocket && (rand() % 100) < net_fakeloss_send.integer)
return length;
if (mysocket->address.addresstype == LHNETADDRESSTYPE_LOOP && netconn_mutex)
Thread_LockMutex(netconn_mutex);
Cvar_RegisterVariable(&net_challengefloodblockingtimeout);
Cvar_RegisterVariable(&net_getstatusfloodblockingtimeout);
Cvar_RegisterVariable(&net_sourceaddresscheck);
- Cvar_RegisterVariable(&cl_netlocalping);
- Cvar_RegisterVariable(&cl_netpacketloss_send);
- Cvar_RegisterVariable(&cl_netpacketloss_receive);
+ Cvar_RegisterVariable(&net_fakelag);
+ Cvar_RegisterVariable(&net_fakeloss_send);
+ Cvar_RegisterVariable(&net_fakeloss_receive);
+ Cvar_RegisterAlias(&net_fakelag, "cl_netlocalping");
+ Cvar_RegisterAlias(&net_fakeloss_send, "cl_netpacketloss_send");
+ Cvar_RegisterAlias(&net_fakeloss_receive, "cl_netpacketloss_receive");
Cvar_RegisterVariable(&hostname);
Cvar_RegisterVariable(&developer_networking);
Cvar_RegisterVariable(&cl_netport);
extern cvar_t sv_public;
-extern cvar_t cl_netlocalping;
+extern cvar_t net_fakelag;
extern cvar_t cl_netport;
extern cvar_t sv_netport;
if(Cmd_Argc(cmd) == 5)
{
cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 4), cmd->cvars_flagsmask);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("prvm_edictget: %s is read-only\n", cvar->name);
- goto fail;
- }
+ if (cvar)
+ if(Cvar_Readonly(cvar, "prvm_edictget"))
+ goto fail;
+
Cvar_Get(cmd->cvars, Cmd_Argv(cmd, 4), s, cmd->cvars_flagsmask, NULL);
}
else
if(Cmd_Argc(cmd) == 4)
{
cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 3), cmd->cvars_flagsmask);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("prvm_globalget: %s is read-only\n", cvar->name);
- goto fail;
- }
+ if (cvar)
+ if(Cvar_Readonly(cvar, "prvm_globalget"))
+ goto fail;
Cvar_Get(cmd->cvars, Cmd_Argv(cmd, 3), s, cmd->cvars_flagsmask, NULL);
}
else
cachepic_t *sb_inter;
cachepic_t *sb_finale;
-cvar_t showfps = {CVAR_CLIENT | CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"};
-cvar_t showsound = {CVAR_CLIENT | CVAR_SAVE, "showsound", "0", "shows number of active sound sources, sound latency, and other statistics"};
-cvar_t showblur = {CVAR_CLIENT | CVAR_SAVE, "showblur", "0", "shows the current alpha level of motionblur"};
-cvar_t showspeed = {CVAR_CLIENT | CVAR_SAVE, "showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots"};
-cvar_t showtopspeed = {CVAR_CLIENT | CVAR_SAVE, "showtopspeed", "0", "shows your top speed (kept on screen for max 3 seconds); value -1 takes over the unit from showspeed, otherwise it's an unit number just like in showspeed"};
-cvar_t showtime = {CVAR_CLIENT | CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"};
-cvar_t showtime_format = {CVAR_CLIENT | CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"};
-cvar_t showdate = {CVAR_CLIENT | CVAR_SAVE, "showdate", "0", "shows current date (useful on screenshots)"};
-cvar_t showdate_format = {CVAR_CLIENT | CVAR_SAVE, "showdate_format", "%Y-%m-%d", "format string for date"};
-cvar_t showtex = {CVAR_CLIENT, "showtex", "0", "shows the name of the texture on the crosshair (for map debugging)"};
+cvar_t cl_showfps = {CVAR_CLIENT | CVAR_SAVE, "cl_showfps", "0", "shows your rendered fps (frames per second)"};
+cvar_t cl_showsound = {CVAR_CLIENT | CVAR_SAVE, "cl_showsound", "0", "shows number of active sound sources, sound latency, and other statistics"};
+cvar_t cl_showblur = {CVAR_CLIENT | CVAR_SAVE, "cl_showblur", "0", "shows the current alpha level of motionblur"};
+cvar_t cl_showspeed = {CVAR_CLIENT | CVAR_SAVE, "cl_showspeed", "0", "shows your current speed (qu per second); number selects unit: 1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots"};
+cvar_t cl_showtopspeed = {CVAR_CLIENT | CVAR_SAVE, "cl_showtopspeed", "0", "shows your top speed (kept on screen for max 3 seconds); value -1 takes over the unit from cl_showspeed, otherwise it's an unit number just like in cl_showspeed"};
+cvar_t cl_showtime = {CVAR_CLIENT | CVAR_SAVE, "cl_showtime", "0", "shows current time of day (useful on screenshots)"};
+cvar_t cl_showtime_format = {CVAR_CLIENT | CVAR_SAVE, "cl_showtime_format", "%H:%M:%S", "format string for time of day"};
+cvar_t cl_showdate = {CVAR_CLIENT | CVAR_SAVE, "cl_showdate", "0", "shows current date (useful on screenshots)"};
+cvar_t cl_showdate_format = {CVAR_CLIENT | CVAR_SAVE, "cl_showdate_format", "%Y-%m-%d", "format string for date"};
+cvar_t cl_showtex = {CVAR_CLIENT, "cl_showtex", "0", "shows the name of the texture on the crosshair (for map debugging)"};
+
cvar_t sbar_alpha_bg = {CVAR_CLIENT | CVAR_SAVE, "sbar_alpha_bg", "0.4", "opacity value of the statusbar background image"};
cvar_t sbar_alpha_fg = {CVAR_CLIENT | CVAR_SAVE, "sbar_alpha_fg", "1", "opacity value of the statusbar weapon/item icons and numbers"};
cvar_t sbar_hudselector = {CVAR_CLIENT | CVAR_SAVE, "sbar_hudselector", "0", "selects which of the builtin hud layouts to use (meaning is somewhat dependent on gamemode, so nexuiz has a very different set of hud layouts than quake for example)"};
Cmd_AddCommand(&cmd_client, "+showscores", Sbar_ShowScores_f, "show scoreboard");
Cmd_AddCommand(&cmd_client, "-showscores", Sbar_DontShowScores_f, "hide scoreboard");
}
- Cvar_RegisterVariable(&showfps);
- Cvar_RegisterVariable(&showsound);
- Cvar_RegisterVariable(&showblur);
- Cvar_RegisterVariable(&showspeed);
- Cvar_RegisterVariable(&showtopspeed);
- Cvar_RegisterVariable(&showtime);
- Cvar_RegisterVariable(&showtime_format);
- Cvar_RegisterVariable(&showdate);
- Cvar_RegisterVariable(&showdate_format);
- Cvar_RegisterVariable(&showtex);
+ Cvar_RegisterVariable(&cl_showfps);
+ Cvar_RegisterVariable(&cl_showsound);
+ Cvar_RegisterVariable(&cl_showblur);
+ Cvar_RegisterVariable(&cl_showspeed);
+ Cvar_RegisterVariable(&cl_showtopspeed);
+ Cvar_RegisterVariable(&cl_showtime);
+ Cvar_RegisterVariable(&cl_showtime_format);
+ Cvar_RegisterVariable(&cl_showdate);
+ Cvar_RegisterVariable(&cl_showdate_format);
+ Cvar_RegisterVariable(&cl_showtex);
+
+ Cvar_RegisterAlias(&cl_showfps, "showfps");
+ Cvar_RegisterAlias(&cl_showsound, "showsound");
+ Cvar_RegisterAlias(&cl_showblur, "showblur");
+ Cvar_RegisterAlias(&cl_showspeed, "showspeed");
+ Cvar_RegisterAlias(&cl_showtopspeed, "showtopspeed");
+ Cvar_RegisterAlias(&cl_showtime, "showtime");
+ Cvar_RegisterAlias(&cl_showtime_format, "showtime_format");
+ Cvar_RegisterAlias(&cl_showdate, "showdate");
+ Cvar_RegisterAlias(&cl_showdate_format, "showdate_format");
+ Cvar_RegisterAlias(&cl_showtex, "showtex");
+
Cvar_RegisterVariable(&sbar_alpha_bg);
Cvar_RegisterVariable(&sbar_alpha_fg);
Cvar_RegisterVariable(&sbar_hudselector);
static void get_showspeed_unit(int unitnumber, double *conversion_factor, const char **unit)
{
if(unitnumber < 0)
- unitnumber = showspeed.integer;
+ unitnumber = cl_showspeed.integer;
switch(unitnumber)
{
default:
topspeedstring[0] = 0;
texstring[0] = 0;
entstring[0] = 0;
- if (showfps.integer)
+ if (cl_showfps.integer)
{
red = (showfps_framerate < 1.0f);
- if(showfps.integer == 2)
+ if(cl_showfps.integer == 2)
dpsnprintf(fpsstring, sizeof(fpsstring), "%7.3f mspf", (1000.0 / showfps_framerate));
else if (red)
dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0 / showfps_framerate + 0.5));
fps_strings++;
}
}
- if (showtime.integer)
+ if (cl_showtime.integer)
{
- strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring));
+ strlcpy(timestring, Sys_TimeString(cl_showtime_format.string), sizeof(timestring));
fps_strings++;
}
- if (showdate.integer)
+ if (cl_showdate.integer)
{
- strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring));
+ strlcpy(datestring, Sys_TimeString(cl_showdate_format.string), sizeof(datestring));
fps_strings++;
}
- if (showblur.integer)
+ if (cl_showblur.integer)
{
dpsnprintf(blurstring, sizeof(blurstring), "%3i%% blur", (int)(cl.motionbluralpha * 100));
fps_strings++;
}
- if (showsound.integer)
+ if (cl_showsound.integer)
{
dpsnprintf(soundstring, sizeof(soundstring), "%4i/4%i at %3ims", cls.soundstats.mixedsounds, cls.soundstats.totalsounds, cls.soundstats.latency_milliseconds);
fps_strings++;
}
- if (showspeed.integer || showtopspeed.integer)
+ if (cl_showspeed.integer || cl_showtopspeed.integer)
{
double speed, speedxy, f;
const char *unit;
speed = VectorLength(cl.movement_velocity);
speedxy = sqrt(cl.movement_velocity[0] * cl.movement_velocity[0] + cl.movement_velocity[1] * cl.movement_velocity[1]);
- if (showspeed.integer)
+ if (cl_showspeed.integer)
{
- get_showspeed_unit(showspeed.integer, &f, &unit);
+ get_showspeed_unit(cl_showspeed.integer, &f, &unit);
dpsnprintf(speedstring, sizeof(speedstring), "%.0f (%.0f) %s", f*speed, f*speedxy, unit);
fps_strings++;
}
- if (showtopspeed.integer)
+ if (cl_showtopspeed.integer)
{
qboolean topspeed_latched = false, topspeedxy_latched = false;
- get_showspeed_unit(showtopspeed.integer, &f, &unit);
+ get_showspeed_unit(cl_showtopspeed.integer, &f, &unit);
if (speed >= topspeed || current_time - top_time > 3)
{
topspeed = speed;
fps_strings++;
}
}
- if (showtex.integer)
+ if (cl_showtex.integer)
{
vec3_t org;
vec3_t dest;
extern cvar_t scr_viewsize;
extern cvar_t scr_fov;
-extern cvar_t showfps;
-extern cvar_t showtime;
-extern cvar_t showdate;
+extern cvar_t cl_showfps;
+extern cvar_t cl_showtime;
+extern cvar_t cl_showdate;
extern cvar_t crosshair;
extern cvar_t crosshair_size;
extern cvar_t scratch3;
extern cvar_t scratch4;
extern cvar_t skill;
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
extern cvar_t sv_accelerate;
extern cvar_t sv_aim;
extern cvar_t sv_airaccel_qw;
cvar_t pr_checkextension = {CVAR_SERVER | CVAR_READONLY, "pr_checkextension", "1", "indicates to QuakeC that the standard quakec extensions system is available (if 0, quakec should not attempt to use extensions)"};
cvar_t samelevel = {CVAR_SERVER | CVAR_NOTIFY, "samelevel","0", "repeats same level if level ends (due to timelimit or someone hitting an exit)"};
cvar_t skill = {CVAR_SERVER, "skill","1", "difficulty level of game, affects monster layouts in levels, 0 = easy, 1 = normal, 2 = hard, 3 = nightmare (same layout as hard but monsters fire twice)"};
-cvar_t slowmo = {CVAR_CLIENT | CVAR_SERVER, "slowmo", "1.0", "controls game speed, 0.5 is half speed, 2 is double speed"};
+cvar_t host_timescale = {CVAR_CLIENT | CVAR_SERVER, "host_timescale", "1.0", "controls game speed, 0.5 is half speed, 2 is double speed"};
cvar_t sv_accelerate = {CVAR_SERVER, "sv_accelerate", "10", "rate at which a player accelerates to sv_maxspeed"};
cvar_t sv_aim = {CVAR_SERVER | CVAR_SAVE, "sv_aim", "2", "maximum cosine angle for quake's vertical autoaim, a value above 1 completely disables the autoaim, quake used 0.93"};
mempool_t *sv_mempool = NULL;
-extern cvar_t slowmo;
+extern cvar_t host_timescale;
extern float scr_centertime_off;
// MUST match effectnameindex_t in client.h
#undef PRVM_DECLARE_function
};
-static void SV_Slowmo_c(char *string)
+static void Host_Timescale_c(char *string)
{
double value;
value = atof(string);
Cvar_RegisterVariable (&pr_checkextension);
Cvar_RegisterVariable (&samelevel);
Cvar_RegisterVariable (&skill);
- Cvar_RegisterVariable (&slowmo);
- Cvar_RegisterCallback (&slowmo, SV_Slowmo_c);
+ Cvar_RegisterVariable (&host_timescale);
+ Cvar_RegisterCallback (&host_timescale, Host_Timescale_c);
+ Cvar_RegisterAlias (&host_timescale, "slowmo");
+ Cvar_RegisterAlias (&host_timescale, "timescale");
Cvar_RegisterVariable (&sv_accelerate);
Cvar_RegisterVariable (&sv_aim);
Cvar_RegisterVariable (&sv_airaccel_qw);
| (sv_gameplayfix_gravityunaffectedbyticrate.integer ? MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE : 0)
;
statsf[STAT_MOVEVARS_TICRATE] = sys_ticrate.value;
- statsf[STAT_MOVEVARS_TIMESCALE] = slowmo.value;
+ statsf[STAT_MOVEVARS_TIMESCALE] = host_timescale.value;
statsf[STAT_MOVEVARS_GRAVITY] = sv_gravity.value;
statsf[STAT_MOVEVARS_STOPSPEED] = sv_stopspeed.value;
statsf[STAT_MOVEVARS_MAXSPEED] = sv_maxspeed.value;
// only advance time if not paused
// the game also pauses in singleplayer when menu or console is used
- sv.frametime = advancetime * slowmo.value;
+ sv.frametime = advancetime * host_timescale.value;
if (host_framerate.value)
sv.frametime = host_framerate.value;
if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
projects / xonotic / darkplaces.git / commitdiff