fix some TraceBox calls that weren't updated like they should have been, so they...

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 0aeb7d04bec7d152eb9babee6499a62a5669419d..13b0798e05f84cd5ca6cda2856b82f1a87f4ef6e 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "image.h"
 
-cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
+cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1", "mipmaps skins (so they become blurrier in the distance), unlike skins the sprites do not have strange border colors"};
 
 /*
 ===============
@@ -219,7 +219,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
                loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type);
                loadmodel->synctype = (synctype_t)LittleLong (pinqsprite->synctype);
 
-               Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete, palette_alpha);
+               Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), NULL, NULL);
        }
        else if (version == SPRITEHL_VERSION)
        {
@@ -367,8 +367,10 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 
                sprframe = &loadmodel->sprite.sprdata_frames[i];
 
-               sprframe->left = origin[0];
-               sprframe->right = origin[0] + width;
+               // note that sp2 origin[0] is positive, where as it is negative in
+               // spr/spr32/hlspr
+               sprframe->left = -origin[0];
+               sprframe->right = -origin[0] + width;
                sprframe->up = origin[1];
                sprframe->down = origin[1] - height;