diff --git a/Pontu/CMakeLists.txt b/Pontu/CMakeLists.txt index a821335..a2dcb2a 100644 --- a/Pontu/CMakeLists.txt +++ b/Pontu/CMakeLists.txt @@ -19,7 +19,7 @@ find_package(SDL2 REQUIRED) target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${SDL2_INCLUDE_DIR}) -target_include_directories(Test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/test ${SDL2_INCLUDE_DIR}) +target_include_directories(Test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ${SDL2_INCLUDE_DIR}) SET(OptionGCC -Wall -Wextra -pedantic -Wconversion -std=c17) diff --git a/Pontu/entryPoints/test.c b/Pontu/entryPoints/test.c index e72bcdd..f6a70b7 100644 --- a/Pontu/entryPoints/test.c +++ b/Pontu/entryPoints/test.c @@ -1,4 +1,4 @@ -#include "test/test.c" +#include "../test/test.c" /* This file is meant to be modified (used only to called other tests functions) diff --git a/Pontu/include/model/Game.h b/Pontu/include/model/Game.h index 2555e20..d39cb48 100644 --- a/Pontu/include/model/Game.h +++ b/Pontu/include/model/Game.h @@ -10,6 +10,7 @@ #include "model/Player.h" #include "model/Board.h" +#include "model/Bridge.h" #include "model/Island.h" #include "model/Coord.h" #include diff --git a/Pontu/src/model/Game.c b/Pontu/src/model/Game.c index 89e838f..2026083 100644 --- a/Pontu/src/model/Game.c +++ b/Pontu/src/model/Game.c @@ -140,14 +140,14 @@ bool moveOnBoard(const Coord start, const Coord end, Game* game) { bool rmBridge(Bridge bridge, Board* board) { - if(brige.islandA.x==bridge.islandB.x) //Horizontal bridge + if(bridge.islandA.x==bridge.islandB.x) //Horizontal bridge { if(board->hBridges[bridge.islandA.y][bridge.islandA.x]) - board->hBridges[bridge.islandA.y][bridge.islandA.x] = false; //Brige coordinates equals to the islandA + board->hBridges[bridge.islandA.y][bridge.islandA.x] = false; //bridge coordinates equals to the islandA return true; } - else if(brige.islandA.y==bridge.islandB.y){ //Vertical bridge + else if(bridge.islandA.y==bridge.islandB.y){ //Vertical bridge if(board->vBridges[bridge.islandA.y][bridge.islandA.x]) { board->vBridges[bridge.islandA.y][bridge.islandA.x] = false; return true; diff --git a/Pontu/test/test.c b/Pontu/test/test.c index 024102b..779c363 100644 --- a/Pontu/test/test.c +++ b/Pontu/test/test.c @@ -111,3 +111,5 @@ int callAll() { return 0; } + +