From 84ce5ac39af2b05f0817deaf6eda3320be80f7fb Mon Sep 17 00:00:00 2001 From: antoinemeyer5 <antoine.meyer54@gmail.com> Date: Wed, 22 Jun 2022 11:58:26 +0200 Subject: [PATCH] collisions avec fenetre terminees --- travail_de_groupe/chef_oeuvre/run | Bin 23664 -> 23848 bytes travail_de_groupe/chef_oeuvre/src/player.c | 53 +++++++++++++++++++-- travail_de_groupe/chef_oeuvre/src/player.h | 2 + 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/travail_de_groupe/chef_oeuvre/run b/travail_de_groupe/chef_oeuvre/run index 52293bf2e20a2065f0262c78b78410ae3bb41383..5e04dae7923aba57f0b2e752a25bdbd03bbb0a5f 100755 GIT binary patch delta 5508 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 delta 4958 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 diff --git a/travail_de_groupe/chef_oeuvre/src/player.c b/travail_de_groupe/chef_oeuvre/src/player.c index 8f77540..0d3d9c8 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.c +++ b/travail_de_groupe/chef_oeuvre/src/player.c @@ -3,26 +3,68 @@ player_t player; void initPlayer(){ - player.x = 0; + player.x = 18*32; player.y = 0; + player.w = CELLSIZE; + player.h = CELLSIZE; player.waterLevel = 0; player.speed = 1; } +int collisionsLeftPlayer(){ + int collision = 0; + if(player.x <= 0){ + collision = 1; + } + return collision; +} + +int collisionsRightPlayer(){ + int collision = 0; + if(player.x + player.w >= (MAPSIZE-1) * CELLSIZE){ + collision = 1; + } + return collision; +} + +int collisionsUpPlayer(){ + int collision = 0; + if(player.y <= 0){ + collision = 1; + } + return collision; +} + +int collisionsDownPlayer(){ + int collision = 0; + if(player.y + player.h >= (MAPSIZE-1) * CELLSIZE){ + collision = 1; + } + return collision; +} + void moveRightPlayer(){ - player.x = player.x + player.speed; + if(!collisionsRightPlayer()){ + player.x = player.x + player.speed; + } } void moveLeftPlayer(){ - player.x = player.x - player.speed; + if(!collisionsLeftPlayer()){ + player.x = player.x - player.speed; + } } void moveUpPlayer(){ - player.y = player.y - player.speed; + if(!collisionsUpPlayer()){ + player.y = player.y - player.speed; + } } void moveDownPlayer(){ - player.y = player.y + player.speed; + if(!collisionsDownPlayer()){ + player.y = player.y + player.speed; + } } void manageMovement(){ @@ -53,3 +95,4 @@ int selectStateHover(){ + diff --git a/travail_de_groupe/chef_oeuvre/src/player.h b/travail_de_groupe/chef_oeuvre/src/player.h index 4f87912..98964cf 100644 --- a/travail_de_groupe/chef_oeuvre/src/player.h +++ b/travail_de_groupe/chef_oeuvre/src/player.h @@ -12,6 +12,8 @@ typedef struct player{ int x; int y; + int w; + int h; int waterLevel; int speed; } player_t; -- GitLab