olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: lift light entity field checks into separate function 

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-02-27 21:13:53 +10:30
parent 854c7b4bb9
commit 54a5890217
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
light/entities.c
View File

@ -134,6 +134,35 @@ vec_from_mangle(vec3_t v, const vec3_t m)
v[2] = sin(tmp[1]); v[2] = sin(tmp[1]);
} }
static void
CheckEntityFields(entity_t *entity)
{
if (!entity->light)
entity->light = DEFAULTLIGHTLEVEL;
if (entity->atten <= 0.0)
entity->atten = 1.0;
if (entity->formula < LF_LINEAR || entity->formula >= LF_COUNT) {
static qboolean warned_once = true;
if (!warned_once) {
warned_once = true;
logprint("WARNING: unknown formula number (%d) in delay field\n"
" %s at (%d %d %d)\n"
" (further formula warnings will be supressed)\n",
entity->formula, entity->classname,
(int)entity->origin[0], (int)entity->origin[1],
(int)entity->origin[2]);
}
entity->formula = LF_LINEAR;
}
if (!entity->lightcolor[0] && !entity->lightcolor[1]
&& !entity->lightcolor[2]) {
entity->lightcolor[0] = 255;
entity->lightcolor[1] = 255;
entity->lightcolor[2] = 255;
}
}
/* /*
* ================== * ==================
* LoadEntities * LoadEntities
@ -241,36 +270,12 @@ LoadEntities(void)
} }
/* /*
* All fields have been parsed. Check default settings and check for * Check light entity fields and any global settings in worldspawn.
* light value in worldspawn...
*/ */
if (!strncmp(entity->classname, "light", 5)) { if (!strncmp(entity->classname, "light", 5)) {
if (!entity->light) CheckEntityFields(entity);
entity->light = DEFAULTLIGHTLEVEL;
if (entity->atten <= 0.0)
entity->atten = 1.0;
if (entity->formula < LF_LINEAR || entity->formula >= LF_COUNT) {
static qboolean warned_once = true;
if (!warned_once) {
warned_once = true;
logprint("WARNING: unknown formula number (%d) in delay "
"field\n %s at (%d %d %d)\n (any further "
"unknown formula warnings will be supressed)\n",
entity->formula, entity->classname,
(int)entity->origin[0], (int)entity->origin[1],
(int)entity->origin[2]);
}
entity->formula = LF_LINEAR;
}
if (!entity->lightcolor[0] && !entity->lightcolor[1]
&& !entity->lightcolor[2]) {
entity->lightcolor[0] = 255;
entity->lightcolor[1] = 255;
entity->lightcolor[2] = 255;
}
num_lights++; num_lights++;
} }
if (!strcmp(entity->classname, "light")) { if (!strcmp(entity->classname, "light")) {
if (entity->targetname[0] && !entity->style) { if (entity->targetname[0] && !entity->style) {
char style[16]; char style[16];
@ -279,7 +284,6 @@ LoadEntities(void)
SetKeyValue(entity, "style", style); SetKeyValue(entity, "style", style);
} }
} }
if (!strcmp(entity->classname, "worldspawn")) { if (!strcmp(entity->classname, "worldspawn")) {
if (entity->light > 0 && !worldminlight) { if (entity->light > 0 && !worldminlight) {
worldminlight = entity->light; worldminlight = entity->light;