removed \n from all Host_Error, Sys_Error, PRVM_ERROR, PF_ERROR calls, since Host_Err...

[xonotic/darkplaces.git] / r_shadow.c

diff --git a/r_shadow.c b/r_shadow.c
index 680295a4e2d67e526089ec4f72a3fade9e6d177d..a929ff5b78e6e7b1512b133525009f3b342194fd 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -481,8 +481,8 @@ void r_shadow_start(void)
                int fragstrings_count;
                const char *vertstrings_list[SHADERPERMUTATION_COUNT+1];
                const char *fragstrings_list[SHADERPERMUTATION_COUNT+1];
-               vertstring = (char *)FS_LoadFile("glsl/light.vert", tempmempool, false);
-               fragstring = (char *)FS_LoadFile("glsl/light.frag", tempmempool, false);
+               vertstring = (char *)FS_LoadFile("glsl/light.vert", tempmempool, false, NULL);
+               fragstring = (char *)FS_LoadFile("glsl/light.frag", tempmempool, false, NULL);
                for (i = 0;i < SHADERPERMUTATION_COUNT;i++)
                {
                        vertstrings_count = 0;
@@ -3109,7 +3109,7 @@ void R_Shadow_FreeWorldLight(dlight_t *light)
        R_RTLight_Uncompile(&light->rtlight);
        for (lightpointer = &r_shadow_worldlightchain;*lightpointer && *lightpointer != light;lightpointer = &(*lightpointer)->next);
        if (*lightpointer != light)
-               Sys_Error("R_Shadow_FreeWorldLight: light not linked into chain\n");
+               Sys_Error("R_Shadow_FreeWorldLight: light not linked into chain");
        *lightpointer = light->next;
        Mem_Free(light);
 }
@@ -3134,7 +3134,7 @@ void R_Shadow_SelectLight(dlight_t *light)
 void R_Shadow_DrawCursorCallback(const void *calldata1, int calldata2)
 {
        float scale = r_editlights_cursorgrid.value * 0.5f;
-       R_DrawSprite(GL_ONE, GL_ONE, lighttextures[0], NULL, false, r_editlights_cursorlocation, r_viewright, r_viewup, scale, -scale, -scale, scale, 1, 1, 1, 0.5f);
+       R_DrawSprite(GL_SRC_ALPHA, GL_ONE, lighttextures[0], NULL, false, r_editlights_cursorlocation, r_viewright, r_viewup, scale, -scale, -scale, scale, 1, 1, 1, 0.5f);
 }
 
 void R_Shadow_DrawLightSpriteCallback(const void *calldata1, int calldata2)
@@ -3147,7 +3147,7 @@ void R_Shadow_DrawLightSpriteCallback(const void *calldata1, int calldata2)
                intensity = 0.75 + 0.25 * sin(realtime * M_PI * 4.0);
        if (!light->shadow)
                intensity *= 0.5f;
-       R_DrawSprite(GL_ONE, GL_ONE, lighttextures[calldata2], NULL, false, light->origin, r_viewright, r_viewup, 8, -8, -8, 8, intensity, intensity, intensity, 0.5);
+       R_DrawSprite(GL_SRC_ALPHA, GL_ONE, lighttextures[calldata2], NULL, false, light->origin, r_viewright, r_viewup, 8, -8, -8, 8, intensity, intensity, intensity, 0.5);
 }
 
 void R_Shadow_DrawLightSprites(void)
@@ -3159,7 +3159,7 @@ void R_Shadow_DrawLightSprites(void)
        for (i = 0;i < 5;i++)
        {
                lighttextures[i] = NULL;
-               if ((pic = Draw_CachePic(va("gfx/crosshair%i.tga", i + 1), true)))
+               if ((pic = Draw_CachePic(va("gfx/crosshair%i", i + 1), true)))
                        lighttextures[i] = pic->tex;
        }
 
@@ -3203,7 +3203,7 @@ void R_Shadow_LoadWorldLights(void)
        }
        FS_StripExtension (r_refdef.worldmodel->name, name, sizeof (name));
        strlcat (name, ".rtlights", sizeof (name));
-       lightsstring = (char *)FS_LoadFile(name, tempmempool, false);
+       lightsstring = (char *)FS_LoadFile(name, tempmempool, false, NULL);
        if (lightsstring)
        {
                s = lightsstring;
@@ -3344,7 +3344,7 @@ void R_Shadow_LoadLightsFile(void)
        }
        FS_StripExtension (r_refdef.worldmodel->name, name, sizeof (name));
        strlcat (name, ".lights", sizeof (name));
-       lightsstring = (char *)FS_LoadFile(name, tempmempool, false);
+       lightsstring = (char *)FS_LoadFile(name, tempmempool, false, NULL);
        if (lightsstring)
        {
                s = lightsstring;
@@ -3400,7 +3400,7 @@ void R_Shadow_LoadWorldLightsFromMap_LightArghliteTyrlite(void)
        // try to load a .ent file first
        FS_StripExtension (r_refdef.worldmodel->name, key, sizeof (key));
        strlcat (key, ".ent", sizeof (key));
-       data = entfiledata = (char *)FS_LoadFile(key, tempmempool, true);
+       data = entfiledata = (char *)FS_LoadFile(key, tempmempool, true, NULL);
        // and if that is not found, fall back to the bsp file entity string
        if (!data)
                data = r_refdef.worldmodel->brush.entities;