Merge branch 'player' into main

travail_de_groupe/chef_oeuvre/src/gest_event.c

@@ -82,11 +82,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:
@@ -110,11 +110,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:

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(){
 
 
 
+

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;