fix draw
This commit is contained in:
		
							parent
							
								
									08621ab489
								
							
						
					
					
						commit
						0e0a294ece
					
				
					 1 changed files with 0 additions and 9 deletions
				
			
		|  | @ -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 <SDL2/SDL.h> | ||||
| 
 | ||||
|  | @ -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) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue