DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / spritegn.h

diff --git a/spritegn.h b/spritegn.h
index 007a8bb238e8df93a5c536e80c200f5cbc8e9fb2..027e64e25160bbaae72d7d369776699bdcb4e3f9 100644 (file)
--- a/spritegn.h
+++ b/spritegn.h
@@ -27,6 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // * pass data from one to the other via .spr files.        *
 // **********************************************************
 
+#ifndef SPRITEGEN_H
+#define SPRITEGEN_H
+
 //-------------------------------------------------------
 // This program generates .spr sprite package files.
 // The format of the files is as follows:
@@ -43,11 +46,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //-------------------------------------------------------
 
 #define SPRITE_VERSION 1
-#define HALFLIFESPRITE_VERSION 2
+#define SPRITEHL_VERSION       2
 #define SPRITE32_VERSION       32
 
-// TODO: shorten these?
-typedef struct {
+typedef struct
+{
        int                     ident;
        int                     version;
        int                     type;
@@ -59,12 +62,32 @@ typedef struct {
        synctype_t      synctype;
 } dsprite_t;
 
+typedef struct
+{
+       int                     ident;
+       int                     version;
+       int                     type;
+       int                     rendermode;
+       float           boundingradius;
+       int                     width;
+       int                     height;
+       int                     numframes;
+       float           beamlength;
+       synctype_t      synctype;
+} dspritehl_t;
+
 #define SPR_VP_PARALLEL_UPRIGHT                0
 #define SPR_FACING_UPRIGHT                     1
 #define SPR_VP_PARALLEL                                2
 #define SPR_ORIENTED                           3
 #define SPR_VP_PARALLEL_ORIENTED       4
 
+#define SPRHL_NORMAL   0
+#define SPRHL_ADDITIVE 1
+// no idea how to handle these two rendering modes
+#define SPRHL_INDEXALPHA       2
+#define SPRHL_ALPHATEST        3
+
 typedef struct {
        int                     origin[2];
        int                     width;
@@ -85,6 +108,5 @@ typedef struct {
        spriteframetype_t       type;
 } dspriteframetype_t;
 
-#define IDSPRITEHEADER (('P'<<24)+('S'<<16)+('D'<<8)+'I')
-                                                                                                               // little-endian "IDSP"
+#endif