X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_sprite.h;h=d28174dfd957e2a672ba02bec638ec23ad8f9ac4;hp=c07c8883601554cc9d9c8d26e0960af722d14f63;hb=4be7d59693a1e9fb66852a4f279cfef85c1880a8;hpb=8dcce44300385b12c46d494c06aadcfa35a8bc14

diff --git a/model_sprite.h b/model_sprite.h
index c07c8883..d28174df 100644
--- a/model_sprite.h
+++ b/model_sprite.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef MODEL_SPRITE_H
+#define MODEL_SPRITE_H
+
 /*
 ==============================================================================
 
@@ -31,32 +34,15 @@ SPRITE MODELS
 // FIXME: shorten these?
 typedef struct mspriteframe_s
 {
-	int		width;
-	int		height;
 	float	up, down, left, right;
-	int		gl_texturenum, gl_fogtexturenum;
 } mspriteframe_t;
 
-typedef struct
+typedef struct model_sprite_s
 {
-	int				numframes;
-	float			*intervals;
-	mspriteframe_t	*frames[1];
-} mspritegroup_t;
+	int				sprnum_type;
+	mspriteframe_t	*sprdata_frames;
+}
+model_sprite_t;
 
-typedef struct
-{
-	spriteframetype_t	type;
-	mspriteframe_t		*frameptr;
-} mspriteframedesc_t;
+#endif
 
-typedef struct
-{
-	int					type;
-	int					maxwidth;
-	int					maxheight;
-	int					numframes;
-	float				beamlength;		// remove?
-	void				*cachespot;		// remove?
-	mspriteframedesc_t	frames[1];
-} msprite_t;