From 0e0a294ece36f9db1d8f505cd38bc58feee61a4d Mon Sep 17 00:00:00 2001 From: Rysertio Date: Wed, 21 Feb 2024 13:39:40 +0600 Subject: [PATCH] fix draw --- src/draw.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/draw.h b/src/draw.h index 9fb826f..e4c0484 100644 --- a/src/draw.h +++ b/src/draw.h @@ -1,5 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD #ifndef DRAW_H #define DRAW_H @@ -13,12 +11,9 @@ void drawGameData(SDL_Renderer *renderer, const GameData *gameData, SDL_Texture *tileTexture, SDL_Texture *unitTexture, SDL_Texture *buildingTexture); #endif /* DRAW_H */ -======= #define MAP_SIZE 96 -======= #ifndef DRAW_H #define DRAW_H ->>>>>>> 6abc1cd (draw function) #include @@ -29,8 +24,4 @@ void drawGameData(SDL_Renderer *renderer, const GameData *gameData, SDL_Texture // Function prototype for drawing game data void drawGameData(SDL_Renderer *renderer, const GameData *gameData, SDL_Texture *tileTexture, SDL_Texture *unitTexture, SDL_Texture *buildingTexture); -<<<<<<< HEAD ->>>>>>> 8e3d2ca (add game structure) -======= #endif /* DRAW_H */ ->>>>>>> 6abc1cd (draw function)