diff --git a/library/Display/Display.o b/library/Display/Display.o index e3960b9ae96f9a0d56604473d35592ad5773338f..6856ce5308c3860634f9df7e7f037593bc8427d9 100644 Binary files a/library/Display/Display.o and b/library/Display/Display.o differ diff --git a/library/Sprites/sprites.o b/library/Sprites/sprites.o index 796391e0984f8bb31c401238dbe68a3cca30be23..46ee4bbdcc1413870abfd802be54e04b3c974c27 100644 Binary files a/library/Sprites/sprites.o and b/library/Sprites/sprites.o differ diff --git a/library/World/world.c b/library/World/world.c index c7e932672c9addcd8829a65b25d22af166f9e854..1d6e8d2183fca78b83b8c4225e7990c89c4ca352 100644 --- a/library/World/world.c +++ b/library/World/world.c @@ -37,7 +37,10 @@ void init_data(world_t * world){ init_walls(world); world->ligneArriver = init_sprite(world->ligneArriver, 0, -world->nb_lines_murs*METEORITE_SIZE-30 , SCREEN_WIDTH, FINISH_LINE_HEIGHT, 'z'); - world->play = init_btn(0, 0, 100, 100); + world->play = init_btn(100,40, 80, 80); + world->exit = init_btn(100, 300, 80, 80); + world->magasin = init_btn(100, 150, 80, 80); + world->sound = init_btn(0, 0, 100, 100); print_sprite(world->vaisseau); world->startTimer = SDL_GetTicks(); diff --git a/library/World/world.h b/library/World/world.h index 93d1abc3201ed2c0d336d5369148f29d211a9bd8..368f0d09e82ca6fd2fc0ed10bbf75c22e31ab9a7 100644 --- a/library/World/world.h +++ b/library/World/world.h @@ -40,7 +40,10 @@ struct world_s{ sprite_t **murs2; /*<Représentation des météorites et de l'air>*/ btn_t *play; - + btn_t *exit; + btn_t *magasin; + btn_t *sound; + int nb_murs; // Nombre de météorites int nb_lines_murs; // Nombre de lignes de météorites sprite_t *ligneArriver; diff --git a/library/World/world.o b/library/World/world.o index ac316bef20c84d1012518c74eae3fedbb3f4e98a..8fb2d42d69ba00185a5fd8de1eb1601f87f810e1 100644 Binary files a/library/World/world.o and b/library/World/world.o differ diff --git a/library/menu/menu.o b/library/menu/menu.o index 84c315fce363b5059bff8e7a368ef00fceb3c935..b6cbc3e665f91e49dc9a7db7cdebb2712ead74c7 100644 Binary files a/library/menu/menu.o and b/library/menu/menu.o differ diff --git a/library/utility/utility.o b/library/utility/utility.o index 3ab3761c00d488f6924c02b7f94aa7aabcb2b55c..4003e8a3c416de54297d07174af1bd67c9aee735 100644 Binary files a/library/utility/utility.o and b/library/utility/utility.o differ diff --git a/main.c b/main.c index 7120aeb324cf6bd04ba3c9431eca3fb983018247..ba1c9b59a301792ae5132958f37d2872cdaee2e2 100644 --- a/main.c +++ b/main.c @@ -75,6 +75,14 @@ void handle_events(SDL_Event *event,world_t *world){ printf("tesy"); world->isMenu = false; } + if (collidePoint(world->magasin, world->mouseX, world->mouseY)){ + printf("tesy"); + world->isMenu = false; + } + if (collidePoint(world->exit, world->mouseX, world->mouseY)){ + printf("tesy"); + world->gameover = true; + } } } } diff --git a/main.o b/main.o index 77b5469e25fa95b21b9e8a9d55ac728c51b01620..455f53f6e984d5ff79726fa1982864a2e5ab184b 100644 Binary files a/main.o and b/main.o differ diff --git a/sdl2-light.o b/sdl2-light.o index c96f2fbbd092f6d2d8d49e75754cc20f9c81150b..b77493b616a056721eb6cd89aa736e0c13fda74b 100644 Binary files a/sdl2-light.o and b/sdl2-light.o differ diff --git a/sdl2-ttf-light.o b/sdl2-ttf-light.o index f8e682ac4d9855b2e3eea678d9470fab1084a9f1..e6dbdb53a08901764f1103130b7cfe977b7bcc21 100644 Binary files a/sdl2-ttf-light.o and b/sdl2-ttf-light.o differ diff --git a/spacecorridor.exe b/spacecorridor.exe index ab0ec70ee0209b4ef6619c77b67a77086c0277f8..fec879cfe5e7e1f93c276a42c66003c3791b7c7a 100644 Binary files a/spacecorridor.exe and b/spacecorridor.exe differ