Merge MR 'Set groundentity when sv_gameplayfix_downtracesupportsongroundflag detects...

[xonotic/darkplaces.git] / spritegn.h

diff --git a/spritegn.h b/spritegn.h
index 9647311077e8ce5c382f8764366a1367fb0612bc..a64f4be958904d1d774f7d1c2258d981604521cd 100644 (file)
--- a/spritegn.h
+++ b/spritegn.h
@@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define SPRITE2_VERSION                2
 
-typedef struct
+typedef struct dsprite_s
 {
        int                     ident;
        int                     version;
@@ -61,10 +61,10 @@ typedef struct
        int                     height;
        int                     numframes;
        float           beamlength;
-       synctype_t      synctype;
+       int                     synctype;
 } dsprite_t;
 
-typedef struct
+typedef struct dspritehl_s
 {
        int                     ident;
        int                     version;
@@ -75,17 +75,17 @@ typedef struct
        int                     height;
        int                     numframes;
        float           beamlength;
-       synctype_t      synctype;
+       int                     synctype;
 } dspritehl_t;
 
-typedef struct
+typedef struct dsprite2frame_s
 {
        int             width, height;
        int             origin_x, origin_y;             // raster coordinates inside pic
        char    name[64];                               // name of pcx file
 } dsprite2frame_t;
 
-typedef struct
+typedef struct dsprite2_s
 {
        int                             ident;
        int                             version;
@@ -98,31 +98,33 @@ typedef struct
 #define SPR_VP_PARALLEL                                2
 #define SPR_ORIENTED                           3
 #define SPR_VP_PARALLEL_ORIENTED       4
+#define SPR_LABEL                      5
+#define SPR_LABEL_SCALE                6
+#define SPR_OVERHEAD                           7
 
 #define SPRHL_OPAQUE   0
 #define SPRHL_ADDITIVE 1
 #define SPRHL_INDEXALPHA       2
 #define SPRHL_ALPHATEST        3
 
-typedef struct {
+typedef struct dspriteframe_s {
        int                     origin[2];
        int                     width;
        int                     height;
 } dspriteframe_t;
 
-typedef struct {
+typedef struct dspritegroup_s {
        int                     numframes;
 } dspritegroup_t;
 
-typedef struct {
+typedef struct dspriteinterval_s {
        float   interval;
 } dspriteinterval_t;
 
-typedef enum { SPR_SINGLE=0, SPR_GROUP } spriteframetype_t;
+typedef enum spriteframetype_e { SPR_SINGLE=0, SPR_GROUP } spriteframetype_t;
 
-typedef struct {
+typedef struct dspriteframetype_s {
        spriteframetype_t       type;
 } dspriteframetype_t;
 
 #endif
-