From e156a2c6025a43452e36f190291f90ffe9440f22 Mon Sep 17 00:00:00 2001 From: mszczepa <marin.szczepanski@inria.fr> Date: Thu, 9 Jun 2022 11:09:41 +0200 Subject: [PATCH] Use apply_input from engine in interrupteurs --- levels/interrupteurs/input_manager.c | 22 +++------------------- levels/interrupteurs/input_manager.h | 2 +- levels/interrupteurs/main.c | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/levels/interrupteurs/input_manager.c b/levels/interrupteurs/input_manager.c index 798e8d21..9c443cca 100644 --- a/levels/interrupteurs/input_manager.c +++ b/levels/interrupteurs/input_manager.c @@ -32,26 +32,10 @@ void touch(void) { #endif } -void apply_input(command * c) { - if (!strcmp(c->command_buffer, "UP")) { - up(); - } else if (!strcmp(c->command_buffer, "UP_N")) { - up_n(atoi(c->args[0])); - } else if (!strcmp(c->command_buffer, "DOWN")) { - down(); - } else if (!strcmp(c->command_buffer, "DOWN_N")) { - down_n(atoi(c->args[0])); - } else if (!strcmp(c->command_buffer, "LEFT")) { - left(); - } else if (!strcmp(c->command_buffer, "LEFT_N")) { - left_n(atoi(c->args[0])); - } else if (!strcmp(c->command_buffer, "RIGHT")) { - right(); - } else if (!strcmp(c->command_buffer, "RIGHT_N")) { - right_n(atoi(c->args[0])); - } else if (!strcmp(c->command_buffer, "TOUCH")) { +void c_apply_input(command * c) { + if (!strcmp(c->command_buffer, "TOUCH")) { touch(); } else { - printf("Unknown input command.\n"); + apply_input(c); } } diff --git a/levels/interrupteurs/input_manager.h b/levels/interrupteurs/input_manager.h index 6258f8b8..59249c54 100644 --- a/levels/interrupteurs/input_manager.h +++ b/levels/interrupteurs/input_manager.h @@ -5,6 +5,6 @@ #include "custom_map.h" // examine la commande c et appelle les fonctions d'action ou de déplacement correspondantes -void apply_input(command * c); +void c_apply_input(command * c); #endif // INPUT_MANAGER_H \ No newline at end of file diff --git a/levels/interrupteurs/main.c b/levels/interrupteurs/main.c index 848aea39..f0921b74 100644 --- a/levels/interrupteurs/main.c +++ b/levels/interrupteurs/main.c @@ -91,7 +91,7 @@ int main(int argc, char ** argv) { // The Holy Main Loop while (!exit_main_loop) { - apply_input(com); + c_apply_input(com); /* since the events may be applied if the input is FORWARD_N, we need to check to avoid triggering the same event twice*/ -- GitLab