Refactoring structs Part 1

src/display/tileset.c

@@ -7,19 +7,15 @@
 
 #include "tileset.h"
 
-tileset_t * tilesetCreate(
+tileset_t * tilesetInit(tileset_t *tileset,
   int32_t columns, int32_t rows,
   int32_t width, int32_t height,
   int32_t gapX, int32_t gapY,
   int32_t borderX, int32_t borderY
 ) {
-  tileset_t *tileset;
   float tdivX, tdivY;
   int32_t x, y, i;
 
-  tileset = malloc(sizeof(tileset_t));
-  if(tileset == NULL) return NULL;
-
   tileset->count = rows * columns;
   tileset->divisions = malloc(sizeof(tilesetdiv_t) * tileset->count);
   if(tileset->divisions == NULL) {
@@ -51,21 +47,13 @@ tileset_t * tilesetCreate(
         borderY + (tileset->divY * y) + (gapY * y)
       ) / height;
       tileset->divisions[i].y1 = tileset->divisions[i].y0 + tdivY;
-
-      // Vertically flipped if necessary
-      // tileset->divisions[i].y1 = (
-      //   borderY + (tileset->divY * y) + (gapY * y)
-      // ) / height;
-      // tileset->divisions[i].y0 = tileset->divisions[i].y1 + tdivY;
     }
   }
 
   return tileset;
 }
 
-tilesetdiv_t tilesetGetDivision(tileset_t *tileset,
-  int32_t column, int32_t row
-) {
+tilesetdiv_t tilesetGetDivision(tileset_t *tileset,int32_t column,int32_t row) {
   return tileset->divisions[
     (column % tileset->columns) + (row * tileset->columns)
   ];
@@ -73,5 +61,4 @@ tilesetdiv_t tilesetGetDivision(tileset_t *tileset,
 
 void tilesetDispose(tileset_t *tileset) {
   free(tileset->divisions);
-  free(tileset);
 }