Cleanup for PR, return old sprite tracker

source/sprite.c

@@ -9,34 +9,34 @@
 #include <stdlib.h>
 #include <maxmod.h>
 
+#define MAX_SPRITES 128
 #define MAX_AFFINES 32
 #define SPRITE_FOCUS_RAISE_PX 10
 
 OBJ_ATTR obj_buffer[MAX_SPRITES];
 OBJ_AFFINE *obj_aff_buffer = (OBJ_AFFINE*)obj_buffer;
 
-typedef struct
-{
-    bool used;
-    Sprite* p_sprite;
-} _UsedSprite;
-
+static Sprite *free_sprites[MAX_SPRITES] = {NULL};
 static bool free_affines[MAX_AFFINES] = {false};
-static _UsedSprite free_sprites[MAX_SPRITES] = {{0}};
 
 // Sprite methods
 Sprite *sprite_new(u16 a0, u16 a1, u32 tid, u32 pb, int sprite_index)
 {
-    if(free_sprites[sprite_index].used)
-    {
-        return free_sprites[sprite_index].p_sprite;
-    }
-
     Sprite* sprite = POOL_GET(Sprite);
 
     sprite->obj = NULL;
     sprite->aff = NULL;
 
+    if(!free_sprites[sprite_index])
+    {
+        free_sprites[sprite_index] = sprite;
+    }
+    else
+    {
+        POOL_FREE(Sprite, sprite);
+        return NULL;
+    }
+
     if (a0 & ATTR0_AFF)
     {
         int aff_index = MAX_AFFINES;
@@ -70,13 +70,11 @@ Sprite *sprite_new(u16 a0, u16 a1, u32 tid, u32 pb, int sprite_index)
         obj_set_attr(sprite->obj, a0, a1, ATTR2_PALBANK(pb) | tid);
     }
 
-    free_sprites[sprite_index].used = true;
-    free_sprites[sprite_index].p_sprite = sprite;
     sprite->idx = sprite_index;
+
     return sprite;
 }
 
-
 void sprite_destroy(Sprite **sprite)
 {
     if (*sprite == NULL) return;
@@ -88,8 +86,7 @@ void sprite_destroy(Sprite **sprite)
         free_affines[(*sprite)->aff - obj_aff_buffer] = false;
     }
 
-    free_sprites[(*sprite)->idx].used = false;
-    free_sprites[(*sprite)->idx].p_sprite = NULL;
+    free_sprites[(*sprite)->idx] = NULL;
 
     POOL_FREE(Sprite, *sprite);
 
@@ -98,7 +95,7 @@ void sprite_destroy(Sprite **sprite)
 
 int sprite_get_layer(Sprite *sprite)
 {
-    if (sprite == NULL || sprite->obj == NULL) return -1;
+    if (sprite == NULL || sprite->obj == NULL) return UNDEFINED;
     return sprite->obj - obj_buffer;
 }