<<<<<<< HEAD keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q")); keyRight = keyboard_check(vk_right) or keyboard_check(ord("D")); keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z")); keyDown = keyboard_check(vk_down) or keyboard_check(ord("S")); keyAttack = keyboard_check_pressed(vk_shift); // Déplacement du joueur deplaceHorizontal = keyRight - keyLeft; deplaceVertical = keyDown - keyUp; x += deplaceHorizontal; y += deplaceVertical; seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0); // Animation des sprites if (seDeplace) { } ======= keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q")); keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));; keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));; keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));; keyAttack = keyboard_check_pressed(vk_shift); deplaceHorizontal = keyRight - keyLeft; deplaceVertical = keyDown - keyUp; x += deplaceHorizontal; y += deplaceVerticald; >>>>>>> master