Changed typedef of st_image to a define so that it actually works. Changed functions to match

Author: Bryce-Dixon

include/spritetools_spritesheet.h

@@ -15,26 +15,27 @@
 /* more easily and safely update */
 #include <sf2d.h>
 
+/*******************************\
+|*     Spritesheet Defines     *|
+\*******************************/
+/* Temporary define until this is split from sf2d */
 #define st_spritesheet sf2d_texture
-
-/********************************\
-|*     Spritesheet Typedefs     *|
-\********************************/
 /* image structure */
-typedef struct {
-  unsigned int width;
-  unsigned int height;
-  unsigned int bytes_per_pixel;
-  unsigned char pixel_data[];
-} st_image;
+#define st_image struct {\
+  unsigned int width;\
+  unsigned int height;\
+  unsigned int bytes_per_pixel;\
+  unsigned char pixel_data[];\
+}
 
 /*********************************\
 |*     Spritesheet Functions     *|
 \*********************************/
 /* Load spritesheet from image */
 /* Takes image */
 /* Returns pointer to st_spritesheet */
-st_spritesheet *ST_SpritesheetCreateSpritesheet(st_image image);
+st_spritesheet *ST_SpritesheetCreateSpritesheet(const unsigned char *pixel_data,
+    unsigned int width, unsigned int height);
 
 /* Free spritesheet */
 /* Takes st_spritesheet */

source/spritetools_spritesheet.c

@@ -13,10 +13,11 @@
 /* Load spritesheet from image */
 /* Takes image */
 /* Returns pointer to st_spritesheet */
-st_spritesheet *ST_SpritesheetCreateSpritesheet(st_image image)
+st_spritesheet *ST_SpritesheetCreateSpritesheet(const unsigned char *pixel_data,
+    unsigned int width, unsigned int height)
 {
-  return sf2d_create_texture_mem_RGBA8(image.pixel_data,
-    image.width, image.height, TEXFMT_RGBA8, SF2D_PLACE_RAM);
+  return sf2d_create_texture_mem_RGBA8(pixel_data, width, height,
+    TEXFMT_RGBA8, SF2D_PLACE_RAM);
 }
 
 /* Free spritesheet */