added radius and radius2 (squared radius) fields to model structure

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index 346fddb10297e7538c9e41f701dbd7782720d53a..102607514824df60d893b4173aa8a33b126aa439 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -36,7 +36,7 @@ void Mod_SpriteInit (void)
        Cvar_RegisterVariable(&r_mipsprites);
 }
 
-void Mod_Sprite_StripExtension(char *in, char *out)
+static void Mod_Sprite_StripExtension(char *in, char *out)
 {
        char *end;
        end = in + strlen(in);
@@ -51,7 +51,7 @@ void Mod_Sprite_StripExtension(char *in, char *out)
        *out++ = 0;
 }
 
-void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
+static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 {
        int                                     i, j, k, groupframes, realframes, x, y, origin[2], width, height;
        dspriteframetype_t      *pinframetype;
@@ -225,15 +225,10 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
                loadmodel->normalmins[i] = loadmodel->yawmins[i] = loadmodel->rotatedmins[i] = -modelradius;
                loadmodel->normalmaxs[i] = loadmodel->yawmaxs[i] = loadmodel->rotatedmaxs[i] = modelradius;
        }
-//     loadmodel->modelradius = modelradius;
+       loadmodel->radius = modelradius;
+       loadmodel->radius2 = modelradius * modelradius;
 }
 
-void Mod_Sprite_SERAddEntity(void)
-{
-       R_ClipSprite();
-}
-
-
 /*
 =================
 Mod_LoadSpriteModel
@@ -249,10 +244,9 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 
        datapointer = buffer;
 
-       loadmodel->SERAddEntity = Mod_Sprite_SERAddEntity;
        loadmodel->Draw = R_DrawSpriteModel;
        loadmodel->DrawSky = NULL;
-       loadmodel->DrawShadow = NULL;
+       loadmodel->DrawFakeShadow = NULL;
 
        version = LittleLong(((dsprite_t *)buffer)->version);
        if (version == SPRITE_VERSION || SPRITE32_VERSION)
@@ -303,7 +297,6 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
                                palette[i][2] = *in++;
                                palette[i][3] = 255;
                        }
-       //              palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
                        loadmodel->flags |= EF_ADDITIVE;
                        break;
                case SPRHL_INDEXALPHA:
@@ -336,3 +329,4 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
        else
                Host_Error ("Mod_LoadSpriteModel: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version);
 }
+