From 75af125d79d444e2dc530a4e97c6469c3d84a818 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Fri, 12 May 2006 21:02:56 +0000 Subject: [PATCH] r_floorcolour/r_wallcolour uses 0-255 range git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2275 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/renderer.c | 4 ++-- engine/gl/gl_model.c | 2 +- engine/gl/gl_ppl.c | 4 ++-- engine/gl/glmod_doom.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/client/renderer.c b/engine/client/renderer.c index 48bb59065..f70c51a02 100644 --- a/engine/client/renderer.c +++ b/engine/client/renderer.c @@ -220,8 +220,8 @@ extern cvar_t r_novis; extern cvar_t r_netgraph; cvar_t r_drawflat = SCVARF("r_drawflat","0", CVAR_SEMICHEAT|CVAR_RENDERERCALLBACK); -cvar_t r_wallcolour = SCVARF("r_wallcolour","1 1 1", CVAR_RENDERERCALLBACK); -cvar_t r_floorcolour = SCVARF("r_floorcolour","1 1 1", CVAR_RENDERERCALLBACK); +cvar_t r_wallcolour = SCVARF("r_wallcolour","255 255 255", CVAR_RENDERERCALLBACK); +cvar_t r_floorcolour = SCVARF("r_floorcolour","255 255 255", CVAR_RENDERERCALLBACK); cvar_t r_walltexture = SCVARF("r_walltexture","", CVAR_RENDERERCALLBACK); cvar_t r_floortexture = SCVARF("r_floortexture","", CVAR_RENDERERCALLBACK); diff --git a/engine/gl/gl_model.c b/engine/gl/gl_model.c index 29f263864..fed854eb9 100644 --- a/engine/gl/gl_model.c +++ b/engine/gl/gl_model.c @@ -3336,7 +3336,7 @@ void GLMod_LoadDoomSprite (model_t *mod) msprite_t *psprite; - COM_StripExtension(mod->name, basename); + COM_StripExtension(mod->name, basename, sizeof(basename)); baselen = strlen(basename); strcat(basename, "*"); *(int *)files=4; diff --git a/engine/gl/gl_ppl.c b/engine/gl/gl_ppl.c index b93af0cf1..bf08a87e0 100644 --- a/engine/gl/gl_ppl.c +++ b/engine/gl/gl_ppl.c @@ -1170,12 +1170,12 @@ static qboolean simpletextures = false; //single textured. void GLR_Wallcolour_Callback(struct cvar_s *var, char *oldvalue) { - SCR_StringToRGB(var->string, wallcolour, 1); + SCR_StringToRGB(var->string, wallcolour, 255); } void GLR_Floorcolour_Callback(struct cvar_s *var, char *oldvalue) { - SCR_StringToRGB(var->string, floorcolour, 1); + SCR_StringToRGB(var->string, floorcolour, 255); } void GLR_Walltexture_Callback(struct cvar_s *var, char *oldvalue) diff --git a/engine/gl/glmod_doom.c b/engine/gl/glmod_doom.c index d1cf19a6b..d585351bd 100644 --- a/engine/gl/glmod_doom.c +++ b/engine/gl/glmod_doom.c @@ -1432,7 +1432,7 @@ qboolean Mod_LoadDoomLevel(model_t *mod) int *gl_nodes; - COM_StripExtension(mod->name, name); + COM_StripExtension(mod->name, name, sizeof(name)); if (!COM_LoadTempFile(va("%s", mod->name))) {