From 4babc2db8efc397eff64b080dbdfe6d988d28b58 Mon Sep 17 00:00:00 2001 From: marouault Date: Mon, 7 Feb 2022 12:01:36 +0100 Subject: [PATCH] Game Main modified (need to correct drawMovePiece and drawDeleteBridge) --- Pontu/entryPoints/main.c | 4 ++-- Pontu/src/view/GameMain.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Pontu/entryPoints/main.c b/Pontu/entryPoints/main.c index dfeee84..5e11e97 100644 --- a/Pontu/entryPoints/main.c +++ b/Pontu/entryPoints/main.c @@ -43,7 +43,7 @@ int main(int argc, char const *argv[]) { FontHandler fontHandler = loadFonts(); AudioHandler audioHandler = newAudioHandler(128, 128, 128); - generalState = GS_MainMenu; + generalState = GS_GameCreationMenu; while(generalState != GS_Quit){ switch (generalState) { case GS_MainMenu: @@ -67,7 +67,7 @@ int main(int argc, char const *argv[]) { fprintf(stderr,"sorry"); exit(-1); }*/ - + generalState = GS_Game; gameView(&generalState, window, renderer, players, nbPlayers); endGameMenu(&generalState, window, renderer, &fontHandler, players, nbPlayers); diff --git a/Pontu/src/view/GameMain.c b/Pontu/src/view/GameMain.c index 5b08067..bd19a9c 100644 --- a/Pontu/src/view/GameMain.c +++ b/Pontu/src/view/GameMain.c @@ -20,7 +20,7 @@ SDL_Rect boardRectFromWindowSize(int windowW, int windowH) { void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* renderer, Player players[], size_t nbPlayers) { if (*generalState != GS_Game) { - return ; + return; } GameInputProcessor inputProcessor = createGameInputProcessor(); struct array_Coord interactiveCases = array_Coord_Create(); @@ -38,9 +38,8 @@ void gameView(GeneralState* generalState, SDL_Window* window, SDL_Renderer* rend drawFullBoard(renderer, &boardRect, &game.board, textureHandler.textures[TEXTURE_Island], textureHandler.textures[TEXTURE_Bridge], textureHandler.textures[TEXTURE_Water]); for (int iPlayer=0; iPlayer