From 9893099eb6f39a1822ed85e426218a48716d256e Mon Sep 17 00:00:00 2001 From: Molgrum Date: Tue, 18 Sep 2007 01:08:49 +0000 Subject: [PATCH] Fixed errors and warnings from the last commits. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2663 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_cg.c | 4 ++-- engine/client/cl_ui.c | 5 +---- engine/client/client.h | 3 +++ engine/common/cvar.h | 2 ++ engine/http/webgen.c | 1 - 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engine/client/cl_cg.c b/engine/client/cl_cg.c index 5baff764d..507675df0 100644 --- a/engine/client/cl_cg.c +++ b/engine/client/cl_cg.c @@ -883,9 +883,9 @@ vec3_t listener_up; case CG_GETGLCONFIG: VALIDATEPOINTER(arg[0], 11332); - //do any needed work - unsigned char *glconfig = VM_POINTER(arg[0]); { //FIXME: Clean this shit up + //do any needed work + unsigned char *glconfig = VM_POINTER(arg[0]); memset(glconfig, 0, 11304); *(int *)(glconfig+11304) = vid.width; *(int *)(glconfig+11308) = vid.height; diff --git a/engine/client/cl_ui.c b/engine/client/cl_ui.c index 84c6a7660..f3ad70b13 100644 --- a/engine/client/cl_ui.c +++ b/engine/client/cl_ui.c @@ -791,10 +791,7 @@ int UI_SystemCallsEx(void *offset, unsigned int mask, int fn, const int *arg) break; case UI_R_REGISTERSKIN: - { - char *buf; - VM_LONG(ret) = VM_TOSTRCACHE(arg[0]); - } + VM_LONG(ret) = VM_TOSTRCACHE(arg[0]); break; case UI_R_REGISTERFONT: //register font diff --git a/engine/client/client.h b/engine/client/client.h index 4b48411dd..7dc4a8484 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -998,8 +998,11 @@ void Skin_FlushPlayers(void); //valid.c +void RulesetLatch(cvar_t *cvar); +void Validation_Apply_Ruleset(void); void Validation_FlushFileList(void); void Validation_CheckIfResponse(char *text); +void Validation_DelatchRulesets(void); void InitValidation(void); void Validation_IncludeFile(char *filename, char *file, int filelen); void Validation_Auto_Response(int playernum, char *s); diff --git a/engine/common/cvar.h b/engine/common/cvar.h index b7222ca2b..a7dade9ef 100644 --- a/engine/common/cvar.h +++ b/engine/common/cvar.h @@ -130,6 +130,8 @@ cvar_t *Cvar_Set (cvar_t *var, const char *value); void Cvar_SetValue (cvar_t *var, float value); // expands value to a string and calls Cvar_Set +qboolean Cvar_ApplyLatchFlag(cvar_t *var, char *value, int flag); + void Cvar_ApplyLatches(int latchflag); //sets vars to thier latched values diff --git a/engine/http/webgen.c b/engine/http/webgen.c index 0742b1da7..040f1ae65 100644 --- a/engine/http/webgen.c +++ b/engine/http/webgen.c @@ -409,7 +409,6 @@ vfsfile_t *IWebGenerateFile(char *name, char *content, int contentlength) int fnum; char *parms; int len; - IWeb_FileGen_t *fbuf; if (!sv.state) return NULL;