diff --git a/src/headers/game.h b/src/headers/game.h index 1ca78ef..be81b93 100644 --- a/src/headers/game.h +++ b/src/headers/game.h @@ -19,7 +19,7 @@ typedef struct game_t { asset_manager_t asset_manager; entity_manager_t entity_manager; - events_t events; + inputs_t events; float delta_time_ms; bool is_running; diff --git a/src/headers/inputs.h b/src/headers/inputs.h index 0e98a40..37298ea 100644 --- a/src/headers/inputs.h +++ b/src/headers/inputs.h @@ -5,20 +5,19 @@ #include "vector2d.h" #include "keycodes.h" -#define EVENT_KEY_UP SDL_EVENT_KEY_UP -#define EVENT_KEY_DOWN SDL_EVENT_KEY_DOWN -#define EVENT_QUIT SDL_EVENT_QUIT +#define INPUT_EVENT_KEY_UP SDL_EVENT_KEY_UP +#define INPUT_EVENT_KEY_DOWN SDL_EVENT_KEY_DOWN +#define INPUT_EVENT_QUIT SDL_EVENT_QUIT -typedef struct event_t { +typedef struct input_event_t { uint32_t type; SDL_Scancode key; -} event_t; +} input_event_t; -int pollevent(event_t *event); +int poll_event(input_event_t *event); -typedef struct events_t { - vector2d_t cursor_pos; +typedef struct inputs_t { bool keys[MAX_KEYCODES]; -} events_t; +} inputs_t; #endif // KEYBOARD_H \ No newline at end of file diff --git a/src/inputs.c b/src/inputs.c index 73ce72b..5b58a31 100644 --- a/src/inputs.c +++ b/src/inputs.c @@ -2,7 +2,7 @@ #include -inline int pollevent(event_t *event) +inline int poll_event(input_event_t *event) { SDL_Event sdl_event; int ret = SDL_PollEvent(&sdl_event);