From a7052667139fa1b9da3fdafc46ed4859ac71727b Mon Sep 17 00:00:00 2001 From: Martin ROUAULT Date: Mon, 29 Nov 2021 11:49:55 +0100 Subject: [PATCH] Make pass need to test on Windows --- Pontu/CMakeLists.txt | 5 +---- Pontu/bin/Pontu | Bin 0 -> 16968 bytes Pontu/include/model/Game.h | 2 +- Pontu/include/model/Player.h | 2 +- Pontu/src/main.c | 4 +++- Pontu/src/model/Game.c | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) create mode 100755 Pontu/bin/Pontu diff --git a/Pontu/CMakeLists.txt b/Pontu/CMakeLists.txt index 1ec61d8..71c6839 100644 --- a/Pontu/CMakeLists.txt +++ b/Pontu/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.13) SET(ProjetName Pontu) -#SET(TestTargetName ) - - project(${ProjetName}) @@ -15,4 +12,4 @@ SET(WarningGCC -Wall -Wextra -pedantic -Wconversion -std=c17 -D_REENTRANT) target_compile_options(${ProjetName} PRIVATE ${WarningGCC} -Og -fdiagnostics-color=always) target_link_libraries(${ProjetName} SDL2) -target_include_directories(${ProjetName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include /usr/include/SDL2) \ No newline at end of file +target_include_directories(${ProjetName} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include /usr/include/SDL2) diff --git a/Pontu/bin/Pontu b/Pontu/bin/Pontu new file mode 100755 index 0000000000000000000000000000000000000000..26e329549a45cf70ca8cd1641b20ab782636e0c3 GIT binary patch literal 16968 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 literal 0 HcmV?d00001 diff --git a/Pontu/include/model/Game.h b/Pontu/include/model/Game.h index f347edc..c85217c 100644 --- a/Pontu/include/model/Game.h +++ b/Pontu/include/model/Game.h @@ -29,7 +29,7 @@ typedef struct { int currentPlayerID; ///< The ID of the one currently playing int nb_rounds; ///< The number of rounds so far //TODO duree - State state; ///< The current state of the game + Phase phase; ///< The current state of the game Player arrPlayers[4]; ///< The array of all the players in this game Board board; ///< The board for this game } Game; diff --git a/Pontu/include/model/Player.h b/Pontu/include/model/Player.h index f979714..dd43d37 100644 --- a/Pontu/include/model/Player.h +++ b/Pontu/include/model/Player.h @@ -21,7 +21,7 @@ typedef struct { char pseudo[PSEUDO_LENMAX]; //< The player's pseudo SDL_Color color; //< The player's Piece' color int rank; //< The player's rank (0 if the player isn't out yet) -} Joueur; +} Player; /** * \brief Creates a new Player diff --git a/Pontu/src/main.c b/Pontu/src/main.c index 328a890..619350a 100644 --- a/Pontu/src/main.c +++ b/Pontu/src/main.c @@ -1,5 +1,7 @@ - +#include int main() { + + SDL_Init(SDL_INIT_EVERYTHING); return 0; } \ No newline at end of file diff --git a/Pontu/src/model/Game.c b/Pontu/src/model/Game.c index 884a220..3ec7c3f 100644 --- a/Pontu/src/model/Game.c +++ b/Pontu/src/model/Game.c @@ -5,12 +5,12 @@ Game newGame(int nbPlayers) { // In Placement phase, the last player initialized is the 1st to play g.currentPlayerID = nbPlayers - 1; g.nb_rounds = 0; - g.state = PLACEMENT; + g.phase = PLACEMENT; g.board = newBoard(nbPlayers); // red, green, blue, yellow // TODO meilleures couleurs (?) - SDL_Color colors[4] { + SDL_Color colors[4] = { {255,0 ,0 ,255}, {0 ,255,0 ,255}, {0 ,0 ,255,255},