"" binds are removed binds (fix behaviour in conjunction with bindmaps not skipping...

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 623243d7c1781b6986aa36eec67effac8b28fe91..8fec8a66938bc44d579fe461f7b75c6e1843f2d9 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -27,6 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1", "mipmaps sprites so they render faster in the distance and do not display noise artifacts"};
 cvar_t r_picmipsprites = {CVAR_SAVE, "r_picmipsprites", "1", "make gl_picmip affect sprites too (saves some graphics memory in sprite heavy games)"};
+cvar_t r_labelsprites_scale = {CVAR_SAVE, "r_labelsprites_scale", "1", "global scale to apply to label sprites before conversion to HUD coordinates"};
+cvar_t r_labelsprites_roundtopixels = {CVAR_SAVE, "r_labelsprites_roundtopixels", "1", "try to make label sprites sharper by rounding their size to 0.5x or 1x and by rounding their position to whole pixels if possible"};
 
 /*
 ===============
@@ -37,6 +39,8 @@ void Mod_SpriteInit (void)
 {
        Cvar_RegisterVariable(&r_mipsprites);
        Cvar_RegisterVariable(&r_picmipsprites);
+       Cvar_RegisterVariable(&r_labelsprites_scale);
+       Cvar_RegisterVariable(&r_labelsprites_roundtopixels);
 }
 
 static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive)
@@ -180,7 +184,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
                                                sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
                                        else
                                                sprintf (name, "%s_%i", loadmodel->name, i);
-                                       if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags, false)))
+                                       if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false)))
                                        {
                                                if (groupframes > 1)
                                                        sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
@@ -223,6 +227,8 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 
        datapointer = (unsigned char *)buffer;
 
+       loadmodel->modeldatatypestring = "SPR1";
+
        loadmodel->type = mod_sprite;
 
        loadmodel->DrawSky = NULL;
@@ -231,6 +237,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->CompileShadowVolume = NULL;
        loadmodel->DrawShadowVolume = NULL;
        loadmodel->DrawLight = NULL;
+       loadmodel->DrawAddWaterPlanes = NULL;
 
        version = LittleLong(((dsprite_t *)buffer)->version);
        if (version == SPRITE_VERSION || version == SPRITE32_VERSION)
@@ -337,7 +344,9 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
        const dsprite2_t *pinqsprite;
        skinframe_t *skinframe;
        float modelradius;
-       int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
+       int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
+
+       loadmodel->modeldatatypestring = "SPR2";
 
        loadmodel->type = mod_sprite;
 
@@ -347,6 +356,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
        loadmodel->CompileShadowVolume = NULL;
        loadmodel->DrawShadowVolume = NULL;
        loadmodel->DrawLight = NULL;
+       loadmodel->DrawAddWaterPlanes = NULL;
 
        pinqsprite = (dsprite2_t *)buffer;