summaryrefslogtreecommitdiff
path: root/src/rend2/tr_surface.c
diff options
context:
space:
mode:
authorSmileTheory <SmileTheory@gmail.com>2013-02-04 20:33:58 -0800
committerTim Angus <tim@ngus.net>2013-02-16 21:54:28 +0000
commit5991530b912c629951c68a9b0767e356c00835e8 (patch)
treefe6274290418821e04102bb64582866b9d3411d0 /src/rend2/tr_surface.c
parent209b348ef47e10cfd0da854fc9bc77c460a66518 (diff)
Merge Reaction renderer features, remove "#ifdef REACTION"s
Diffstat (limited to 'src/rend2/tr_surface.c')
-rw-r--r--src/rend2/tr_surface.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/rend2/tr_surface.c b/src/rend2/tr_surface.c
index 406c7a26..ad7f5a5f 100644
--- a/src/rend2/tr_surface.c
+++ b/src/rend2/tr_surface.c
@@ -300,27 +300,7 @@ static void RB_SurfaceSprite( void ) {
VectorSubtract( vec3_origin, left, left );
}
-#ifdef REACTION
- if (ent->e.renderfx & RF_SUNFLARE)
- {
- if (backEnd.viewHasSunFlare)
- {
- ri.Printf(PRINT_WARNING, "Multiple sun flares not supported\n");
- return;
- }
- if (R_CullPointAndRadiusEx(ent->e.origin, ent->e.radius, backEnd.viewParms.frustum, (backEnd.viewParms.flags & VPF_FARPLANEFRUSTUM) ? 5 : 4) == CULL_OUT)
- return;
- colors[0] = colors[1] = colors[2] = colors[3] = ent->e.shaderRGBA[glRefConfig.framebufferObject] / 255.0f;
- if (colors[0] == 0)
- return;
- backEnd.viewHasSunFlare = qtrue;
- backEnd.frameHasSunFlare = qtrue;
- }
- else
-#endif
- {
- VectorScale4(ent->e.shaderRGBA, 1.0f / 255.0f, colors);
- }
+ VectorScale4(ent->e.shaderRGBA, 1.0f / 255.0f, colors);
RB_AddQuadStamp( ent->e.origin, left, up, colors );
}