stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-22 03:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use ordered ids instead of hashes for cvar netid

Browse source 
Originally 6acd99c0a4
This commit is contained in:
James R 2020-06-19 16:36:36 -07:00
parent bff6b19056
commit 32773b71e0
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/command.c
View file

@ -56,7 +56,9 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
static boolean CV_Command(void); static boolean CV_Command(void);
consvar_t *CV_FindVar(const char *name); consvar_t *CV_FindVar(const char *name);
static const char *CV_StringValue(const char *var_name); static const char *CV_StringValue(const char *var_name);
static consvar_t *consvar_vars; // list of registered console variables static consvar_t *consvar_vars; // list of registered console variables
static UINT16 consvar_number_of_netids = 0;
static char com_token[1024]; static char com_token[1024];
static char *COM_Parse(char *data); static char *COM_Parse(char *data);
@ -1126,7 +1128,6 @@ consvar_t *CV_FindVar(const char *name)
* *
* \param s Name of the variable. * \param s Name of the variable.
* \return A new unique identifier. * \return A new unique identifier.
* \sa CV_FindNetVar
*/ */
static inline UINT16 CV_ComputeNetid(const char *s) static inline UINT16 CV_ComputeNetid(const char *s)
{ {
@ -1146,12 +1147,14 @@ static inline UINT16 CV_ComputeNetid(const char *s)
* *
* \param netid The variable's identifier number. * \param netid The variable's identifier number.
* \return A pointer to the variable itself if found, or NULL. * \return A pointer to the variable itself if found, or NULL.
* \sa CV_ComputeNetid
*/ */
static consvar_t *CV_FindNetVar(UINT16 netid) static consvar_t *CV_FindNetVar(UINT16 netid)
{ {
consvar_t *cvar; consvar_t *cvar;
if (netid > consvar_number_of_netids)
return NULL;
for (cvar = consvar_vars; cvar; cvar = cvar->next) for (cvar = consvar_vars; cvar; cvar = cvar->next)
if (cvar->netid == netid) if (cvar->netid == netid)
return cvar; return cvar;
@ -1184,11 +1187,11 @@ void CV_RegisterVar(consvar_t *variable)
// check net variables // check net variables
if (variable->flags & CV_NETVAR) if (variable->flags & CV_NETVAR)
{ {
const consvar_t *netvar; variable->netid = consvar_number_of_netids++;
variable->netid = CV_ComputeNetid(variable->name);
netvar = CV_FindNetVar(variable->netid); /* in case of overflow... */
if (netvar) if (variable->netid > consvar_number_of_netids)
I_Error("Variables %s and %s have same netid\n", variable->name, netvar->name); I_Error("Way too many netvars");
} }
// link the variable in // link the variable in