fix for sprite scale bug (it was scaling vup and vright!)

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 9495016b7694c03c0efd7625aaa1eef2c7766fcf..2347d941c9e7d9b9f40127741ab871563d2aee39 100644 (file)
--- a/render.h
+++ b/render.h
@@ -68,7 +68,6 @@ typedef struct entity_s
        struct efrag_s                  *efrag;                 // linked list of efrags
        int                                             frame;
        float                                   syncbase;               // for client-side animations
-//     byte                                    *colormap;
        int                                             colormap;
        int                                             effects;                // light, particals, etc
        int                                             skinnum;                // for Alias models
@@ -129,7 +128,7 @@ extern      struct texture_s        *r_notexture_mip;
 
 // LordHavoc: generic image loader
 byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
-int loadtextureimage (int texnum, char* filename, qboolean complain, int matchwidth, int matchheight);
+int loadtextureimage (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap);
 
 void R_Init (void);
 void R_InitTextures (void);
@@ -151,7 +150,8 @@ void R_ParseParticleEffect (void);
 void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count);
 void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent);
 void R_RocketTrail2 (vec3_t start, vec3_t end, int type, entity_t *ent);
-void R_SparkShower (vec3_t org, vec3_t dir, int count, int type);
+void R_SparkShower (vec3_t org, vec3_t dir, int count);
+void R_BloodPuff (vec3_t org);
 
 void R_EntityParticles (entity_t *ent);
 void R_BlobExplosion (vec3_t org);