safety checked lightmap access in Mod_Q1BSP_RecursiveLightPoint as one map Sajt uses...

[xonotic/darkplaces.git] / r_shadow.c

diff --git a/r_shadow.c b/r_shadow.c
index 518cbc44ec468b4e62de6d59db8375f5b9775224..8c083ece236e4fa1b9bfdd4671bd5ac62cf8f45f 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -297,6 +297,11 @@ void R_Shadow_Init(void)
        Cvar_RegisterVariable(&r_shadow_worldshadows);
        Cvar_RegisterVariable(&r_shadow_dlightshadows);
        Cvar_RegisterVariable(&r_shadow_showtris);
+       if (gamemode == GAME_TENEBRAE)
+       {
+               Cvar_SetValue("r_shadow_gloss", 2);
+               Cvar_SetValue("r_shadow_bumpscale_basetexture", 4);
+       }
        Cmd_AddCommand("r_shadow_help", R_Shadow_Help_f);
        R_Shadow_EditLights_Init();
        R_RegisterModule("R_Shadow", r_shadow_start, r_shadow_shutdown, r_shadow_newmap);
@@ -2501,7 +2506,7 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void)
 {
        int entnum, style, islight, skin, pflags;
        char key[256], value[1024];
-       float origin[3], radius, color[3], light, fadescale, lightscale, originhack[3], overridecolor[3];
+       float origin[3], angles[3], radius, color[3], light, fadescale, lightscale, originhack[3], overridecolor[3];
        const char *data;
 
        if (cl.worldmodel == NULL)
@@ -2517,6 +2522,7 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void)
                light = 0;
                origin[0] = origin[1] = origin[2] = 0;
                originhack[0] = originhack[1] = originhack[2] = 0;
+               angles[0] = angles[1] = angles[2] = 0;
                color[0] = color[1] = color[2] = 1;
                overridecolor[0] = overridecolor[1] = overridecolor[2] = 1;
                fadescale = 1;
@@ -2546,6 +2552,10 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void)
                                light = atof(value);
                        else if (!strcmp("origin", key))
                                sscanf(value, "%f %f %f", &origin[0], &origin[1], &origin[2]);
+                       else if (!strcmp("angle", key))
+                               angles[0] = 0, angles[1] = atof(value), angles[2] = 0;
+                       else if (!strcmp("angles", key))
+                               sscanf(value, "%f %f %f", &angles[0], &angles[1], &angles[2]);
                        else if (!strcmp("color", key))
                                sscanf(value, "%f %f %f", &color[0], &color[1], &color[2]);
                        else if (!strcmp("wait", key))
@@ -2647,7 +2657,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, !!(pflags & 2), style, !(pflags & 1), skin >= 16 ? va("cubemaps/%i", skin) : NULL);
+                       R_Shadow_NewWorldLight(origin, angles, color, radius, !!(pflags & 2), style, !(pflags & 1), skin >= 16 ? va("cubemaps/%i", skin) : NULL);
        }
 }