better error handling for overlong srcon commands

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index e1a8b180624ce80ea0debc3fac880317eab5ea19..bf5a8f9ff6e4bd1c95412b1016a9362a6730a776 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -202,12 +202,15 @@ void R_RotateSprite(const mspriteframe_t *frame, vec3_t origin, vec3_t left, vec
 void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
        int i;
-       model_t *model = ent->model;
+       dp_model_t *model = ent->model;
        vec3_t left, up, org, mforward, mleft, mup, middle;
        float scale, dx, dy, hud_vs_screen;
        int edge = 0;
        float dir_angle = 0.0f;
 
+       // R_GetCurrentTexture needs this
+       rsurface.entity = (entity_render_t *)ent;
+
        // nudge it toward the view to make sure it isn't in a wall
        Matrix4x4_ToVectors(&ent->matrix, mforward, mleft, mup, org);
        VectorSubtract(org, r_refdef.view.forward, org);
@@ -250,6 +253,9 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
                // fixed HUD pixel size specified in sprite
                // honors scale
                // honors a global label scaling cvar
+       
+               if(r_waterstate.renderingscene) // labels are considered HUD items, and don't appear in reflections
+                       return;
 
                // See the R_TrackSprite definition for a reason for this copying
                VectorCopy(r_refdef.view.left, left);
@@ -271,6 +277,9 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
                // honors a global label scaling cvar before the rounding
                // FIXME assumes that 1qu is 1 pixel in the sprite like in SPR32 format. Should not do that, but instead query the source image! This bug only applies to the roundtopixels case, though.
 
+               if(r_waterstate.renderingscene) // labels are considered HUD items, and don't appear in reflections
+                       return;
+
                // See the R_TrackSprite definition for a reason for this copying
                VectorCopy(r_refdef.view.left, left);
                VectorCopy(r_refdef.view.up, up);
@@ -349,16 +358,15 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
        R_Mesh_Matrix(&identitymatrix);
 
        // LordHavoc: interpolated sprite rendering
-       for (i = 0;i < 4;i++)
+       for (i = 0;i < MAX_FRAMEBLENDS;i++)
        {
                if (ent->frameblend[i].lerp >= 0.01f)
                {
-                       mspriteframe_t *frame = model->sprite.sprdata_frames + ent->frameblend[i].frame;
-                       texture_t *texture = model->data_textures + ent->frameblend[i].frame;
+                       mspriteframe_t *frame = model->sprite.sprdata_frames + ent->frameblend[i].subframe;
+                       texture_t *texture = R_GetCurrentTexture(model->data_textures + ent->frameblend[i].subframe);
 #if 0
                        vec3_t o, l, u;
 #endif
-                       R_UpdateTextureInfo(ent, texture);
 
                        // SPR_LABEL should not use depth test AT ALL
                        if(model->sprite.sprnum_type == SPR_LABEL || model->sprite.sprnum_type == SPR_LABEL_SCALE)
@@ -390,12 +398,14 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
                        }
                }
        }
+
+       rsurface.entity = NULL;
 }
 
 void R_Model_Sprite_Draw(entity_render_t *ent)
 {
        vec3_t org;
-       if (ent->frameblend[0].frame < 0)
+       if (ent->frameblend[0].subframe < 0)
                return;
 
        Matrix4x4_OriginFromMatrix(&ent->matrix, org);