From 6c37bacbd37c01453733ebf324f986c2c913eb4a Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 28 Feb 2004 15:15:55 +0000 Subject: [PATCH] support skin and pflags in light entity loader git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3933 d7cf8633-e32d-0410-b094-e92efae38249 --- r_shadow.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/r_shadow.c b/r_shadow.c index c806c539..518cbc44 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -2499,7 +2499,7 @@ void R_Shadow_LoadLightsFile(void) void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void) { - int entnum, style, islight; + int entnum, style, islight, skin, pflags; char key[256], value[1024]; float origin[3], radius, color[3], light, fadescale, lightscale, originhack[3], overridecolor[3]; const char *data; @@ -2522,6 +2522,8 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void) fadescale = 1; lightscale = 1; style = 0; + skin = 0; + pflags = 0; islight = false; while (1) { @@ -2627,6 +2629,10 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void) if (!strcmp("fade", key)) fadescale = atof(value); } + else if (!strcmp("skin", key)) + skin = (int)atof(value); + else if (!strcmp("pflags", key)) + pflags = (int)atof(value); } if (light <= 0 && islight) light = 300; @@ -2641,7 +2647,7 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void) VectorScale(color, light, color); VectorAdd(origin, originhack, origin); if (radius >= 15) - R_Shadow_NewWorldLight(origin, vec3_origin, color, radius, 0, style, true, NULL); + R_Shadow_NewWorldLight(origin, vec3_origin, color, radius, !!(pflags & 2), style, !(pflags & 1), skin >= 16 ? va("cubemaps/%i", skin) : NULL); } } -- 2.39.2