mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-26 22:31:05 +00:00
rename the qw c declaration of the client name cvar from name to cl_name
This commit is contained in:
parent
220f8a6e38
commit
c7ee39acbb
7 changed files with 9 additions and 9 deletions
|
@ -272,7 +272,7 @@ extern cvar_t *m_yaw;
|
||||||
extern cvar_t *m_forward;
|
extern cvar_t *m_forward;
|
||||||
extern cvar_t *m_side;
|
extern cvar_t *m_side;
|
||||||
|
|
||||||
extern struct cvar_s *name;
|
extern struct cvar_s *cl_name;
|
||||||
|
|
||||||
#define MAX_TEMP_ENTITIES 64 // lightning bolts, etc
|
#define MAX_TEMP_ENTITIES 64 // lightning bolts, etc
|
||||||
#define MAX_STATIC_ENTITIES 128 // torches, etc
|
#define MAX_STATIC_ENTITIES 128 // torches, etc
|
||||||
|
|
|
@ -132,7 +132,7 @@ determine_face (vec3_t v)
|
||||||
i = 2;
|
i = 2;
|
||||||
}
|
}
|
||||||
if (!m) {
|
if (!m) {
|
||||||
Sys_Error ("%s speared by sky poly edge\n", name->string);
|
Sys_Error ("%s speared by sky poly edge\n", cl_name->string);
|
||||||
}
|
}
|
||||||
if (v[i] < 0)
|
if (v[i] < 0)
|
||||||
i += 3;
|
i += 3;
|
||||||
|
|
|
@ -310,7 +310,7 @@ extern struct cvar_s *m_yaw;
|
||||||
extern struct cvar_s *m_forward;
|
extern struct cvar_s *m_forward;
|
||||||
extern struct cvar_s *m_side;
|
extern struct cvar_s *m_side;
|
||||||
|
|
||||||
extern struct cvar_s *name;
|
extern struct cvar_s *cl_name;
|
||||||
|
|
||||||
|
|
||||||
#define MAX_STATIC_ENTITIES 128 // torches, etc
|
#define MAX_STATIC_ENTITIES 128 // torches, etc
|
||||||
|
|
|
@ -150,7 +150,7 @@ static qboolean allowremotecmd = true;
|
||||||
//
|
//
|
||||||
cvar_t *password;
|
cvar_t *password;
|
||||||
cvar_t *spectator;
|
cvar_t *spectator;
|
||||||
cvar_t *name;
|
cvar_t *cl_name;
|
||||||
cvar_t *team;
|
cvar_t *team;
|
||||||
cvar_t *rate;
|
cvar_t *rate;
|
||||||
cvar_t *noaim;
|
cvar_t *noaim;
|
||||||
|
@ -1296,8 +1296,8 @@ CL_Init_Cvars (void)
|
||||||
//
|
//
|
||||||
// info mirrors
|
// info mirrors
|
||||||
//
|
//
|
||||||
name = Cvar_Get ("name", "unnamed", CVAR_ARCHIVE | CVAR_USERINFO, Cvar_Info,
|
cl_name = Cvar_Get ("name", "unnamed", CVAR_ARCHIVE | CVAR_USERINFO,
|
||||||
"Player name");
|
Cvar_Info, "Player name");
|
||||||
password = Cvar_Get ("password", "", CVAR_USERINFO, Cvar_Info,
|
password = Cvar_Get ("password", "", CVAR_USERINFO, Cvar_Info,
|
||||||
"Server password");
|
"Server password");
|
||||||
spectator = Cvar_Get ("spectator", "", CVAR_USERINFO, Cvar_Info,
|
spectator = Cvar_Get ("spectator", "", CVAR_USERINFO, Cvar_Info,
|
||||||
|
|
|
@ -792,7 +792,7 @@ SCR_RSShot_f (void)
|
||||||
st[sizeof (st) - 1] = 0;
|
st[sizeof (st) - 1] = 0;
|
||||||
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 11, w);
|
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 11, w);
|
||||||
|
|
||||||
strncpy (st, name->string, sizeof (st));
|
strncpy (st, cl_name->string, sizeof (st));
|
||||||
st[sizeof (st) - 1] = 0;
|
st[sizeof (st) - 1] = 0;
|
||||||
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 21, w);
|
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 21, w);
|
||||||
|
|
||||||
|
|
|
@ -132,7 +132,7 @@ determine_face (vec3_t v)
|
||||||
i = 2;
|
i = 2;
|
||||||
}
|
}
|
||||||
if (!m) {
|
if (!m) {
|
||||||
Sys_Error ("%s speared by sky poly edge\n", name->string);
|
Sys_Error ("%s speared by sky poly edge\n", cl_name->string);
|
||||||
}
|
}
|
||||||
if (v[i] < 0)
|
if (v[i] < 0)
|
||||||
i += 3;
|
i += 3;
|
||||||
|
|
|
@ -802,7 +802,7 @@ SCR_RSShot_f (void)
|
||||||
st[sizeof (st) - 1] = 0;
|
st[sizeof (st) - 1] = 0;
|
||||||
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 10, w);
|
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 10, w);
|
||||||
|
|
||||||
strncpy (st, name->string, sizeof (st));
|
strncpy (st, cl_name->string, sizeof (st));
|
||||||
st[sizeof (st) - 1] = 0;
|
st[sizeof (st) - 1] = 0;
|
||||||
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 20, w);
|
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 20, w);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue