diff --git a/CMakeLists.txt b/CMakeLists.txt index ac933ff..8c975ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.5.1) # define project list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdl2) +set(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,-subsystem,console) project(AST VERSION 1.0.0 DESCRIPTION "Arena Survival Tournament" LANGUAGES C) set(AST_NAME AST-${PROJECT_VERSION}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY) diff --git a/src/arenaEngine.c b/src/arenaEngine.c index a0a4477..358db01 100644 --- a/src/arenaEngine.c +++ b/src/arenaEngine.c @@ -3,6 +3,11 @@ #include #include "arenaEngine.h" +#ifdef _WIN32 + #define DATA_PATH(p) "data\\p" +#else + #define DATA_PATH(p) "data/p" +#endif /* * Arena generate functions @@ -18,37 +23,37 @@ TILE *createTileList(void) { tile_5 = calloc(1,sizeof(TILE)); tile_0->type_id = 0; - tile_0->texture = IMG_Load("data/tile_grass.png"); + tile_0->texture = IMG_Load(DATA_PATH("tile_grass.png")); tile_0->canBeMined = 0; tile_0->isGround = 1; tile_0->nextTile = tile_1; tile_1->type_id = 1; - tile_1->texture = IMG_Load("data/tile_rock.png"); + tile_1->texture = IMG_Load(DATA_PATH("tile_rock.png")); tile_1->canBeMined = 0; tile_1->isGround = 1; tile_1->nextTile = tile_2; tile_2->type_id = 2; - tile_2->texture = IMG_Load("data/tile_tree.png"); + tile_2->texture = IMG_Load(DATA_PATH("tile_tree.png")); tile_2->canBeMined = 0; tile_2->isGround = 0; tile_2->nextTile = tile_3; tile_3->type_id = 3; - tile_3->texture = IMG_Load("data/tile_water.png"); + tile_3->texture = IMG_Load(DATA_PATH("tile_water.png")); tile_3->canBeMined = 0; tile_3->isGround = 0; tile_3->nextTile = tile_4; tile_4->type_id = 4; - tile_4->texture = IMG_Load("data/tile_gold.png"); + tile_4->texture = IMG_Load(DATA_PATH("tile_gold.png")); tile_4->canBeMined = 1; tile_4->isGround = 1; tile_4->nextTile = tile_5; tile_5->type_id = 5; - tile_5->texture = IMG_Load("data/tile_spawn.png"); + tile_5->texture = IMG_Load(DATA_PATH("tile_spawn.png")); tile_5->canBeMined = 0; tile_5->isGround = 1; tile_5->nextTile = NULL; @@ -68,10 +73,10 @@ PLAYER *createPlayerList(void) { p0->Id = 0; p0->PositionX = 0; p0->PositionY = 0; - p0->texture[DOWN] = IMG_Load("data/sprite_player_0.png"); - p0->texture[UP] = IMG_Load("data/sprite_player_1.png"); - p0->texture[LEFT] = IMG_Load("data/sprite_player_2.png"); - p0->texture[RIGHT] = IMG_Load("data/sprite_player_3.png"); + p0->texture[DOWN] = IMG_Load(DATA_PATH("sprite_player_0.png")); + p0->texture[UP] = IMG_Load(DATA_PATH("sprite_player_1.png")); + p0->texture[LEFT] = IMG_Load(DATA_PATH("sprite_player_2.png")); + p0->texture[RIGHT] = IMG_Load(DATA_PATH("sprite_player_3.png")); p0->suiv = p1; printf("Entrer le nom du joueur\n"); scanf("%s",p0->Name); @@ -105,10 +110,10 @@ PLAYER *createPlayerList(void) { p1->Id = 1; p1->PositionX = A_WIDTH-1; p1->PositionY = A_HEIGHT-1; - p1->texture[DOWN] = IMG_Load("data/sprite_ia_0.png"); - p1->texture[UP] = IMG_Load("data/sprite_ia_1.png"); - p1->texture[LEFT] = IMG_Load("data/sprite_ia_2.png"); - p1->texture[RIGHT] = IMG_Load("data/sprite_ia_3.png"); + p1->texture[DOWN] = IMG_Load(DATA_PATH("sprite_ia_0.png")); + p1->texture[UP] = IMG_Load(DATA_PATH("sprite_ia_1.png")); + p1->texture[LEFT] = IMG_Load(DATA_PATH("sprite_ia_2.png")); + p1->texture[RIGHT] = IMG_Load(DATA_PATH("sprite_ia_3.png")); p1->suiv = p2; strcpy(p1->Name,"SKY-NUT"); p1->Race = random_lim(3)+1;