Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut

Pontu/include/engine/Colors.h

@@ -1,7 +1,7 @@
 #ifndef COLORS_H_INCLUDED
 #define COLORS_H_INCLUDED
 
-#include <SDL2/SDL_Pixel.h>
+#include <SDL2/SDL_pixels.h>
 
 const SDL_Color COLOR_GENERIC_BUTTON_BACKGROUND = {225, 225, 225, 255};
 const SDL_Color COLOR_GENERIC_BUTTON_BORDER = {10, 10, 10, 255};

Pontu/include/engine/GeneralState.h

@@ -0,0 +1,6 @@
+#ifndef GENERAL_STATE_INCLUDED
+#define GENERAL_STATE_INCLUDED
+
+typedef enum {GS_MainMenu, GS_GameCreationMenu, GS_Game, GS_EndOfGameMenu} GeneralState;
+
+#endif //GENERAL_STATE_INCLUDED

Pontu/src/engine/Button.c

@@ -20,7 +20,7 @@ bool drawButtonOnRenderer(SDL_Renderer* renderer, P_Button* button)
 	SDL_SetRenderTarget(renderer, NULL);
 	if(SDL_RenderCopy(renderer,button->hover && button->hoverTexture != NULL ? button->hoverTexture : button->texture,NULL,&(button->rect)))
 	{
-		fprintf(stderr,"Warning: %s\n",SDL_GetError());
+		fprintf(stderr,"SDLWarning: %s\n",SDL_GetError());
 		return false;
 	}
 	button->drawn = true;