diff --git a/travail_de_groupe/chef_oeuvre/run b/travail_de_groupe/chef_oeuvre/run index f13487eaa4ee73d86959a31d2804193c1a8ff73a..52293bf2e20a2065f0262c78b78410ae3bb41383 100755 Binary files a/travail_de_groupe/chef_oeuvre/run and b/travail_de_groupe/chef_oeuvre/run differ diff --git a/travail_de_groupe/chef_oeuvre/src/gest_event.c b/travail_de_groupe/chef_oeuvre/src/gest_event.c index 223f17608357c849e744b6d44d885786e25aae9c..d6f89fa5903fedac6c0b53ff6f3fb765baf4e351 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 960ff345127e96befb67f5b01d2dedade5c40621..8f77540f356eda9c95f2617dff02ebabab038021 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 d9d63e572e6f381de98356ed1a4942ce01b3dd87..4f8791242356c2fac3238982e1671e11d3397982 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;