sys: work around incomplete POSIX support in MacOS

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index f066c84c7bab0452ebc2a2bc03d0f8c849376756..7e96f676f751a16f0e645c883392de85bca21f74 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -25,17 +25,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "image.h"
 
 #include "quakedef.h"
 #include "image.h"
 

-cvar_t r_mipsprites = {CVAR_CLIENT | CVAR_SAVE, "r_mipsprites", "1", "mipmaps sprites so they render faster in the distance and do not display noise artifacts"};
-cvar_t r_labelsprites_scale = {CVAR_CLIENT | CVAR_SAVE, "r_labelsprites_scale", "1", "global scale to apply to label sprites before conversion to HUD coordinates"};
-cvar_t r_labelsprites_roundtopixels = {CVAR_CLIENT | 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"};
-cvar_t r_overheadsprites_perspective = {CVAR_CLIENT | CVAR_SAVE, "r_overheadsprites_perspective", "5", "fake perspective effect for SPR_OVERHEAD sprites"};
-cvar_t r_overheadsprites_pushback = {CVAR_CLIENT | CVAR_SAVE, "r_overheadsprites_pushback", "15", "how far to pull the SPR_OVERHEAD sprites toward the eye (used to avoid intersections with 3D models)"};
-cvar_t r_overheadsprites_scalex = {CVAR_CLIENT | CVAR_SAVE, "r_overheadsprites_scalex", "1", "additional scale for overhead sprites for x axis"};
-cvar_t r_overheadsprites_scaley = {CVAR_CLIENT | CVAR_SAVE, "r_overheadsprites_scaley", "1", "additional scale for overhead sprites for y axis"};
-cvar_t r_track_sprites = {CVAR_CLIENT | CVAR_SAVE, "r_track_sprites", "1", "track SPR_LABEL* sprites by putting them as indicator at the screen border to rotate to"};
-cvar_t r_track_sprites_flags = {CVAR_CLIENT | CVAR_SAVE, "r_track_sprites_flags", "1", "1: Rotate sprites accordingly, 2: Make it a continuous rotation"};
-cvar_t r_track_sprites_scalew = {CVAR_CLIENT | CVAR_SAVE, "r_track_sprites_scalew", "1", "width scaling of tracked sprites"};
-cvar_t r_track_sprites_scaleh = {CVAR_CLIENT | CVAR_SAVE, "r_track_sprites_scaleh", "1", "height scaling of tracked sprites"};
+cvar_t r_mipsprites = {CF_CLIENT | CF_ARCHIVE, "r_mipsprites", "1", "mipmaps sprites so they render faster in the distance and do not display noise artifacts"};
+cvar_t r_labelsprites_scale = {CF_CLIENT | CF_ARCHIVE, "r_labelsprites_scale", "1", "global scale to apply to label sprites before conversion to HUD coordinates"};
+cvar_t r_labelsprites_roundtopixels = {CF_CLIENT | CF_ARCHIVE, "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"};
+cvar_t r_overheadsprites_perspective = {CF_CLIENT | CF_ARCHIVE, "r_overheadsprites_perspective", "5", "fake perspective effect for SPR_OVERHEAD sprites"};
+cvar_t r_overheadsprites_pushback = {CF_CLIENT | CF_ARCHIVE, "r_overheadsprites_pushback", "15", "how far to pull the SPR_OVERHEAD sprites toward the eye (used to avoid intersections with 3D models)"};
+cvar_t r_overheadsprites_scalex = {CF_CLIENT | CF_ARCHIVE, "r_overheadsprites_scalex", "1", "additional scale for overhead sprites for x axis"};
+cvar_t r_overheadsprites_scaley = {CF_CLIENT | CF_ARCHIVE, "r_overheadsprites_scaley", "1", "additional scale for overhead sprites for y axis"};
+cvar_t r_track_sprites = {CF_CLIENT | CF_ARCHIVE, "r_track_sprites", "1", "track SPR_LABEL* sprites by putting them as indicator at the screen border to rotate to"};
+cvar_t r_track_sprites_flags = {CF_CLIENT | CF_ARCHIVE, "r_track_sprites_flags", "1", "1: Rotate sprites accordingly, 2: Make it a continuous rotation"};
+cvar_t r_track_sprites_scalew = {CF_CLIENT | CF_ARCHIVE, "r_track_sprites_scalew", "1", "width scaling of tracked sprites"};
+cvar_t r_track_sprites_scaleh = {CF_CLIENT | CF_ARCHIVE, "r_track_sprites_scaleh", "1", "height scaling of tracked sprites"};

 
 /*
 ===============
 
 /*
 ===============


@@ -57,7 +57,7 @@ void Mod_SpriteInit (void)
        Cvar_RegisterVariable(&r_track_sprites_scaleh);
 }
 
        Cvar_RegisterVariable(&r_track_sprites_scaleh);
 }
 

-static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive)
+static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qbool fullbright, qbool additive)

 {
        if (!skinframe)
                skinframe = R_SkinFrame_LoadMissing();
 {
        if (!skinframe)
                skinframe = R_SkinFrame_LoadMissing();


@@ -88,18 +88,18 @@ static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, q
 
 extern cvar_t gl_texturecompression_sprites;
 
 
 extern cvar_t gl_texturecompression_sprites;
 

-static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, qboolean additive)
+static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, qbool additive)

 {
 {

-       int                                     i, j, groupframes, realframes, x, y, origin[2], width, height;
-       qboolean                        fullbright;
-       dspriteframetype_t      *pinframetype;
-       dspriteframe_t          *pinframe;
-       dspritegroup_t          *pingroup;
-       dspriteinterval_t       *pinintervals;
-       skinframe_t                     *skinframe;
-       float                           modelradius, interval;
-       char                            name[MAX_QPATH], fogname[MAX_QPATH];
-       const void                      *startframes;
+       int                 i, j, groupframes, realframes, x, y, origin[2], width, height;
+       qbool               fullbright;
+       dspriteframetype_t  pinframetype;
+       dspriteframe_t      pinframe;
+       dspritegroup_t      pingroup;
+       dspriteinterval_t   pinintervals;
+       skinframe_t         *skinframe;
+       float               modelradius, interval;
+       char                name[MAX_QPATH], fogname[MAX_QPATH];
+       const void          *startframes;

        int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | ((gl_texturecompression.integer && gl_texturecompression_sprites.integer) ? TEXF_COMPRESS : 0) | TEXF_ISSPRITE | TEXF_PICMIP | TEXF_ALPHA | TEXF_CLAMP;
        modelradius = 0;
 
        int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | ((gl_texturecompression.integer && gl_texturecompression_sprites.integer) ? TEXF_COMPRESS : 0) | TEXF_ISSPRITE | TEXF_PICMIP | TEXF_ALPHA | TEXF_CLAMP;
        modelradius = 0;
 


@@ -114,33 +114,34 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 
 //
 // load the frames
 
 //
 // load the frames

+// bones_was_here: memcpy() used here to prevent misaligned access with struct-based parsing

 //
        startframes = datapointer;
        realframes = 0;
        for (i = 0;i < loadmodel->numframes;i++)
        {
 //
        startframes = datapointer;
        realframes = 0;
        for (i = 0;i < loadmodel->numframes;i++)
        {

-               pinframetype = (dspriteframetype_t *)datapointer;
+               memcpy(&pinframetype, datapointer, sizeof(dspriteframetype_t));

                datapointer += sizeof(dspriteframetype_t);
 
                datapointer += sizeof(dspriteframetype_t);
 

-               if (LittleLong (pinframetype->type) == SPR_SINGLE)
+               if (LittleLong (pinframetype.type) == SPR_SINGLE)

                        groupframes = 1;
                else
                {
                        groupframes = 1;
                else
                {

-                       pingroup = (dspritegroup_t *)datapointer;
+                       memcpy(&pingroup, datapointer, sizeof(dspritegroup_t));

                        datapointer += sizeof(dspritegroup_t);
 
                        datapointer += sizeof(dspritegroup_t);
 

-                       groupframes = LittleLong(pingroup->numframes);
+                       groupframes = LittleLong(pingroup.numframes);

 
                        datapointer += sizeof(dspriteinterval_t) * groupframes;
                }
 
                for (j = 0;j < groupframes;j++)
                {
 
                        datapointer += sizeof(dspriteinterval_t) * groupframes;
                }
 
                for (j = 0;j < groupframes;j++)
                {

-                       pinframe = (dspriteframe_t *)datapointer;
+                       memcpy(&pinframe, datapointer, sizeof(dspriteframe_t));

                        if (version == SPRITE32_VERSION)
                        if (version == SPRITE32_VERSION)

-                               datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height) * 4;
+                               datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe.width) * LittleLong(pinframe.height) * 4;

                        else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
                        else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)

-                               datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height);
+                               datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe.width) * LittleLong(pinframe.height);

                }
                realframes += groupframes;
        }
                }
                realframes += groupframes;
        }


@@ -155,25 +156,25 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
        realframes = 0;
        for (i = 0;i < loadmodel->numframes;i++)
        {
        realframes = 0;
        for (i = 0;i < loadmodel->numframes;i++)
        {

-               pinframetype = (dspriteframetype_t *)datapointer;
+               memcpy(&pinframetype, datapointer, sizeof(dspriteframetype_t));

                datapointer += sizeof(dspriteframetype_t);
 
                datapointer += sizeof(dspriteframetype_t);
 

-               if (LittleLong (pinframetype->type) == SPR_SINGLE)
+               if (LittleLong (pinframetype.type) == SPR_SINGLE)

                {
                        groupframes = 1;
                        interval = 0.1f;
                }
                else
                {
                {
                        groupframes = 1;
                        interval = 0.1f;
                }
                else
                {

-                       pingroup = (dspritegroup_t *)datapointer;
+                       memcpy(&pingroup, datapointer, sizeof(dspritegroup_t));

                        datapointer += sizeof(dspritegroup_t);
 
                        datapointer += sizeof(dspritegroup_t);
 

-                       groupframes = LittleLong(pingroup->numframes);
+                       groupframes = LittleLong(pingroup.numframes);

 
 

-                       pinintervals = (dspriteinterval_t *)datapointer;
+                       memcpy(&pinintervals, datapointer, sizeof(dspriteinterval_t));

                        datapointer += sizeof(dspriteinterval_t) * groupframes;
 
                        datapointer += sizeof(dspriteinterval_t) * groupframes;
 

-                       interval = LittleFloat(pinintervals[0].interval);
+                       interval = LittleFloat(pinintervals.interval);

                        if (interval < 0.01f)
                                Host_Error("Mod_Sprite_SharedSetup: invalid interval");
                }
                        if (interval < 0.01f)
                                Host_Error("Mod_Sprite_SharedSetup: invalid interval");
                }


@@ -186,13 +187,13 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 
                for (j = 0;j < groupframes;j++)
                {
 
                for (j = 0;j < groupframes;j++)
                {

-                       pinframe = (dspriteframe_t *)datapointer;
+                       memcpy(&pinframe, datapointer, sizeof(dspriteframe_t));

                        datapointer += sizeof(dspriteframe_t);
 
                        datapointer += sizeof(dspriteframe_t);
 

-                       origin[0] = LittleLong (pinframe->origin[0]);
-                       origin[1] = LittleLong (pinframe->origin[1]);
-                       width = LittleLong (pinframe->width);
-                       height = LittleLong (pinframe->height);
+                       origin[0] = LittleLong (pinframe.origin[0]);
+                       origin[1] = LittleLong (pinframe.origin[1]);
+                       width = LittleLong (pinframe.width);
+                       height = LittleLong (pinframe.height);

 
                        loadmodel->sprite.sprdata_frames[realframes].left = origin[0];
                        loadmodel->sprite.sprdata_frames[realframes].right = origin[0] + width;
 
                        loadmodel->sprite.sprdata_frames[realframes].left = origin[0];
                        loadmodel->sprite.sprdata_frames[realframes].right = origin[0] + width;


@@ -263,7 +264,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
        loadmodel->radius2 = modelradius * modelradius;
 }
 
        loadmodel->radius2 = modelradius * modelradius;
 }
 

-void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
+void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)

 {
        int version;
        const unsigned char *datapointer;
 {
        int version;
        const unsigned char *datapointer;


@@ -274,11 +275,9 @@ void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 
        loadmodel->type = mod_sprite;
 
 
        loadmodel->type = mod_sprite;
 

-       loadmodel->DrawSky = NULL;

        loadmodel->Draw = R_Model_Sprite_Draw;
        loadmodel->DrawDepth = NULL;
        loadmodel->DrawLight = NULL;
        loadmodel->Draw = R_Model_Sprite_Draw;
        loadmodel->DrawDepth = NULL;
        loadmodel->DrawLight = NULL;

-       loadmodel->DrawAddWaterPlanes = NULL;

 
        version = LittleLong(((dsprite_t *)buffer)->version);
        if (version == SPRITE_VERSION || version == SPRITE32_VERSION)
 
        version = LittleLong(((dsprite_t *)buffer)->version);
        if (version == SPRITE_VERSION || version == SPRITE32_VERSION)


@@ -376,10 +375,10 @@ void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 }
 
 
 }
 
 

-void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend)
+void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)

 {
        int i, version;
 {
        int i, version;

-       qboolean fullbright;
+       qbool fullbright;

        const dsprite2_t *pinqsprite;
        skinframe_t *skinframe;
        float modelradius;
        const dsprite2_t *pinqsprite;
        skinframe_t *skinframe;
        float modelradius;


@@ -389,11 +388,9 @@ void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend)
 
        loadmodel->type = mod_sprite;
 
 
        loadmodel->type = mod_sprite;
 

-       loadmodel->DrawSky = NULL;

        loadmodel->Draw = R_Model_Sprite_Draw;
        loadmodel->DrawDepth = NULL;
        loadmodel->DrawLight = NULL;
        loadmodel->Draw = R_Model_Sprite_Draw;
        loadmodel->DrawDepth = NULL;
        loadmodel->DrawLight = NULL;

-       loadmodel->DrawAddWaterPlanes = NULL;

 
        pinqsprite = (dsprite2_t *)buffer;
 
 
        pinqsprite = (dsprite2_t *)buffer;
 


@@ -462,7 +459,7 @@ void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend)
                        pinframe = &pinqsprite->frames[i];
                        if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false, false)))
                        {
                        pinframe = &pinqsprite->frames[i];
                        if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false, false)))
                        {

-                               Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name);
+                               Con_Printf(CON_ERROR "Mod_IDS2_Load: failed to load %s", pinframe->name);

                                skinframe = R_SkinFrame_LoadMissing();
                        }
                        Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);
                                skinframe = R_SkinFrame_LoadMissing();
                        }
                        Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);