Test more flexible

merge-requests/1/merge
marouault 4 years ago
parent cacb66ccf9
commit 745ca533b2

@ -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(${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) SET(OptionGCC -Wall -Wextra -pedantic -Wconversion -std=c17)

@ -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) This file is meant to be modified (used only to called other tests functions)

@ -10,6 +10,7 @@
#include "model/Player.h" #include "model/Player.h"
#include "model/Board.h" #include "model/Board.h"
#include "model/Bridge.h"
#include "model/Island.h" #include "model/Island.h"
#include "model/Coord.h" #include "model/Coord.h"
#include <SDL2/SDL_pixels.h> #include <SDL2/SDL_pixels.h>

@ -140,14 +140,14 @@ bool moveOnBoard(const Coord start, const Coord end, Game* game) {
bool rmBridge(Bridge bridge, Board* board) { 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]) 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; 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]) { if(board->vBridges[bridge.islandA.y][bridge.islandA.x]) {
board->vBridges[bridge.islandA.y][bridge.islandA.x] = false; board->vBridges[bridge.islandA.y][bridge.islandA.x] = false;
return true; return true;

@ -111,3 +111,5 @@ int callAll() {
return 0; return 0;
} }

Loading…
Cancel
Save