From f7c2ee17da706385738ebeb9134ca2a6ce58bdc7 Mon Sep 17 00:00:00 2001 From: antoinemeyer5 <antoine.meyer54@gmail.com> Date: Wed, 22 Jun 2022 11:28:25 +0200 Subject: [PATCH] deplacement un peu mieux + reste le deplacement diagonal --- travail_de_groupe/chef_oeuvre/run | Bin 23480 -> 23664 bytes .../chef_oeuvre/src/gest_event.c | 8 ++--- travail_de_groupe/chef_oeuvre/src/player.c | 34 +++++++++++++----- travail_de_groupe/chef_oeuvre/src/player.h | 6 ++++ 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/travail_de_groupe/chef_oeuvre/run b/travail_de_groupe/chef_oeuvre/run index f13487eaa4ee73d86959a31d2804193c1a8ff73a..52293bf2e20a2065f0262c78b78410ae3bb41383 100755 GIT binary patch delta 5161 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 delta 4398 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 diff --git a/travail_de_groupe/chef_oeuvre/src/gest_event.c b/travail_de_groupe/chef_oeuvre/src/gest_event.c index 223f176..d6f89fa 100644 --- a/travail_de_groupe/chef_oeuvre/src/gest_event.c +++ b/travail_de_groupe/chef_oeuvre/src/gest_event.c @@ -79,11 +79,11 @@ void manageGame(){ break; case SDLK_LEFT: - keys[2] = 0; + keys[PLAYER_LEFT] = 0; break; case SDLK_RIGHT: - keys[3] = 0; + keys[PLAYER_RIGHT] = 0; break; default: @@ -107,11 +107,11 @@ void manageGame(){ break; case SDLK_LEFT: - keys[2] = 1; + keys[PLAYER_LEFT] = 1; break; case SDLK_RIGHT: - keys[3] = 1; + keys[PLAYER_RIGHT] = 1; break; default: diff --git a/travail_de_groupe/chef_oeuvre/src/player.c b/travail_de_groupe/chef_oeuvre/src/player.c index 960ff34..8f77540 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.c +++ b/travail_de_groupe/chef_oeuvre/src/player.c @@ -6,20 +6,37 @@ void initPlayer(){ player.x = 0; player.y = 0; player.waterLevel = 0; + player.speed = 1; +} + +void moveRightPlayer(){ + player.x = player.x + player.speed; +} + +void moveLeftPlayer(){ + player.x = player.x - player.speed; +} + +void moveUpPlayer(){ + player.y = player.y - player.speed; +} + +void moveDownPlayer(){ + player.y = player.y + player.speed; } void manageMovement(){ - if(keys[0] == 1){ - player.y--; + if(keys[PLAYER_UP]){ + moveUpPlayer(); } - if(keys[1] == 1){ - player.y++; + if(keys[PLAYER_DOWN] == 1){ + moveDownPlayer(); } - if(keys[2] == 1){ - player.x--; + if(keys[PLAYER_LEFT] == 1){ + moveLeftPlayer(); } - if(keys[3] == 1){ - player.x++; + if(keys[PLAYER_RIGHT] == 1){ + moveRightPlayer(); } } @@ -35,3 +52,4 @@ int selectStateHover(){ + diff --git a/travail_de_groupe/chef_oeuvre/src/player.h b/travail_de_groupe/chef_oeuvre/src/player.h index d9d63e5..4f87912 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.h +++ b/travail_de_groupe/chef_oeuvre/src/player.h @@ -4,10 +4,16 @@ #include "main.h" #include "gest_event.h" +#define PLAYER_UP 0 +#define PLAYER_DOWN 1 +#define PLAYER_LEFT 2 +#define PLAYER_RIGHT 3 + typedef struct player{ int x; int y; int waterLevel; + int speed; } player_t; extern player_t player; -- GitLab