From 32b19295ea120138dd6a83383f9377a0c851dcb8 Mon Sep 17 00:00:00 2001 From: antoinemeyer5 <antoine.meyer54@gmail.com> Date: Wed, 22 Jun 2022 10:20:20 +0200 Subject: [PATCH] modif fire, function selectHover and gest_event menu & game --- travail_de_groupe/chef_oeuvre/run | Bin 22952 -> 23480 bytes travail_de_groupe/chef_oeuvre/src/fire.h | 11 ++-- .../chef_oeuvre/src/gest_event.c | 51 +++++++++++++++++- travail_de_groupe/chef_oeuvre/src/player.c | 11 +++- travail_de_groupe/chef_oeuvre/src/player.h | 1 + 5 files changed, 64 insertions(+), 10 deletions(-) diff --git a/travail_de_groupe/chef_oeuvre/run b/travail_de_groupe/chef_oeuvre/run index de6e5ad8d704c532afd54cc3e4af6d2936d4558d..f13487eaa4ee73d86959a31d2804193c1a8ff73a 100755 GIT binary patch delta 7082 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 T_KY;=x*i1KNik0L3X%f=ZEhJ2 delta 5798 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 diff --git a/travail_de_groupe/chef_oeuvre/src/fire.h b/travail_de_groupe/chef_oeuvre/src/fire.h index aa02f2a..e7b35f3 100644 --- a/travail_de_groupe/chef_oeuvre/src/fire.h +++ b/travail_de_groupe/chef_oeuvre/src/fire.h @@ -9,12 +9,6 @@ typedef enum false,true }booleen_t; -typedef struct chain { - fire_t fire; - - struct chain *next; -}chainfire_t,*listchainfire_t; - typedef struct fire{ int x; int y; @@ -22,6 +16,11 @@ typedef struct fire{ }fire_t; +typedef struct chain { + fire_t fire; + + struct chain *next; +}chainfire_t,*listchainfire_t; listchainfire_t initFire(void); listchainfire_t insertAheadFire(fire_t, listchainfire_t); diff --git a/travail_de_groupe/chef_oeuvre/src/gest_event.c b/travail_de_groupe/chef_oeuvre/src/gest_event.c index 0c62f08..223f176 100644 --- a/travail_de_groupe/chef_oeuvre/src/gest_event.c +++ b/travail_de_groupe/chef_oeuvre/src/gest_event.c @@ -7,6 +7,54 @@ int y; int keys[10]; void manageMenu(){ + SDL_Event event; + while (SDL_PollEvent(&event)){ + switch(event.type) + { + case SDL_QUIT: + running = 0; + break; + + case SDL_KEYUP: + switch (event.key.keysym.sym) + { + case SDLK_ESCAPE: + running = 0; + continue; + + default: + continue; + } + break; + + case SDL_KEYDOWN: + switch (event.key.keysym.sym) + { + case SDLK_ESCAPE: + running = 0; + continue; + + default: + continue; + } + break; + + case SDL_MOUSEMOTION: + x = (event.motion.x - (screenDimension.w - (MAPSIZE * CELLSIZE)) / 2) / CELLSIZE; + y = (event.motion.y - 0) / CELLSIZE; + hover[0] = x; + hover[1] = y; + continue; + + default: + continue; + } + } + manageMovement(); + SDL_Delay(5); +} + +void manageGame(){ SDL_Event event; while (SDL_PollEvent(&event)){ switch(event.type) @@ -86,12 +134,11 @@ void manageMenu(){ SDL_Delay(5); } - void *eventLoop(void *arg){ while(running){ switch(gameState){ case MENU : manageMenu();break; - case GAME : manageMenu();break; + case GAME : manageGame();break; default:printf("game state fault");break; } } diff --git a/travail_de_groupe/chef_oeuvre/src/player.c b/travail_de_groupe/chef_oeuvre/src/player.c index 1ee12d7..960ff34 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.c +++ b/travail_de_groupe/chef_oeuvre/src/player.c @@ -24,7 +24,14 @@ void manageMovement(){ } int selectStateHover(){ - + int stateHover = 0; + int distance = sqrt(pow(abs(hover[0]-player.x), 2)+pow(abs(hover[1]-player.y), 2)); + printf("distance : %d\n", distance); + if(distance <= 2){ + stateHover = 1; + } + return stateHover; } - QUiChsoiitLeBonHover(); //0 = nonHover et 1 = hover + + diff --git a/travail_de_groupe/chef_oeuvre/src/player.h b/travail_de_groupe/chef_oeuvre/src/player.h index 2037f22..d9d63e5 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.h +++ b/travail_de_groupe/chef_oeuvre/src/player.h @@ -14,5 +14,6 @@ extern player_t player; void initPlayer(); void manageMovement(); +int selectStateHover(); #endif \ No newline at end of file -- GitLab