diff --git a/tiles/tile.h b/tiles/tile.h index 8e32192..a5478ce 100644 --- a/tiles/tile.h +++ b/tiles/tile.h @@ -40,7 +40,7 @@ extern TileType TileRegistry[TILEREGISTRY_SIZE]; #define TYPE_AIR 0 #define TYPE_BELT 2 -void renderAllTiles(SDL_Renderer * renderer, SDL_Rect playerRect); +void renderAllTiles(SDL_Renderer *renderer, SDL_Rect playerRect); typedef struct { OrientDirection direction; @@ -54,6 +54,7 @@ typedef struct { extern Tile tileMap[MAP_HEIGHT][MAP_WIDTH]; void generateTestMap(); + void loadTiles(SDL_Renderer *renderer); extern uint16_t tileTypeIndex; diff --git a/util/util.c b/util/util.c index 2128c85..34dd837 100644 --- a/util/util.c +++ b/util/util.c @@ -120,7 +120,7 @@ void renderBar(SDL_Renderer *renderer, } int cmpstringp(const void *p1, const void *p2) { - return strcmp(*(const char **)p1, *(const char **)p2); + return strcmp(*(const char **) p1, *(const char **) p2); } @@ -150,7 +150,7 @@ void iterateSortedDir(const char *path, DirEntryCallback callback, SDL_Renderer closedir(dir); // Sort entries - qsort(names, count, sizeof(char *), cmpstringp); + qsort(names, count, sizeof(char *), cmpstringp); // Call the user-provided function for each file if (names != NULL) { diff --git a/util/util.h b/util/util.h index 5234c06..aef74a5 100644 --- a/util/util.h +++ b/util/util.h @@ -6,6 +6,7 @@ #define FACTORYGAME_UTIL_H #include + //The window we'll be rendering to extern SDL_Window *window; extern volatile bool running; @@ -33,9 +34,9 @@ SDL_Texture *createRotatedTexture(SDL_Renderer *renderer, SDL_Texture *src, doub SDL_Texture *createFlippedTexture(SDL_Renderer *renderer, SDL_Texture *src, SDL_RendererFlip flip); -SDL_Texture* ScaleTexture(SDL_Renderer* renderer, SDL_Texture* src, int newWidth, int newHeight); +SDL_Texture *ScaleTexture(SDL_Renderer *renderer, SDL_Texture *src, int newWidth, int newHeight); -void DrawThickRect(SDL_Renderer* renderer, SDL_Rect rect, int thickness); +void DrawThickRect(SDL_Renderer *renderer, SDL_Rect rect, int thickness); // Define a function pointer type for your callback typedef void (*DirEntryCallback)(const char *filename, SDL_Renderer *renderer);