From 9c728f69927abde8a4d76cae85ced9a0b7fa5ae1 Mon Sep 17 00:00:00 2001 From: Ulysse Cura Date: Fri, 14 Aug 2026 16:42:29 +0200 Subject: [PATCH] Reactions to core changes. --- SDL3_Core | 2 +- src/components/headers/sprite_component.h | 1 + src/components/player_system.c | 14 +++++++------- src/game.c | 18 +++++++++--------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/SDL3_Core b/SDL3_Core index 9d06fa7..1fa9d1c 160000 --- a/SDL3_Core +++ b/SDL3_Core @@ -1 +1 @@ -Subproject commit 9d06fa7877e6afba927a572311cd0bba68d2a823 +Subproject commit 1fa9d1cb8703da10bc7e6011df9f29d87e4eac95 diff --git a/src/components/headers/sprite_component.h b/src/components/headers/sprite_component.h index bfa2213..ca5bcce 100644 --- a/src/components/headers/sprite_component.h +++ b/src/components/headers/sprite_component.h @@ -4,6 +4,7 @@ #include "ecs.h" #include "transform_component.h" #include "asset_manager.h" +#include "texture.h" typedef struct sprite_component_data_t { transform_component_data_t *transform_component_data; diff --git a/src/components/player_system.c b/src/components/player_system.c index 50955b9..d3f0543 100644 --- a/src/components/player_system.c +++ b/src/components/player_system.c @@ -64,11 +64,11 @@ static inline void player_system_get_inputs(player_system_data_t *system_data) system_data->state &= 0xE0; // 11100000 - system_data->state |= game.events.keys[KEY_UP] ? PLAYER_MOVING_UP : 0; - system_data->state |= game.events.keys[KEY_DOWN] ? PLAYER_MOVING_DOWN : 0; - system_data->state |= game.events.keys[KEY_LEFT] ? PLAYER_MOVING_LEFT : 0; - system_data->state |= game.events.keys[KEY_RIGHT] ? PLAYER_MOVING_RIGHT : 0; - system_data->state |= game.events.keys[KEY_MOD] ? PLAYER_RUNNING : 0; + system_data->state |= game.inputs.keys[KEY_UP] ? PLAYER_MOVING_UP : 0; + system_data->state |= game.inputs.keys[KEY_DOWN] ? PLAYER_MOVING_DOWN : 0; + system_data->state |= game.inputs.keys[KEY_LEFT] ? PLAYER_MOVING_LEFT : 0; + system_data->state |= game.inputs.keys[KEY_RIGHT] ? PLAYER_MOVING_RIGHT : 0; + system_data->state |= game.inputs.keys[KEY_MOD] ? PLAYER_RUNNING : 0; // Special cases if(system_data->state & PLAYER_MOVING_UP && system_data->state & PLAYER_MOVING_DOWN) @@ -186,12 +186,12 @@ static inline int player_system_process_interaction(player_system_data_t *system { static bool last_state = false; // XXX UGLY XXX // - if(game.events.keys[KEY_INTERACT] && !last_state) + if(game.inputs.keys[KEY_INTERACT] && !last_state) { if(linked_list_for_each(&game.entity_manager.entities, action_detect_activate_interact, system_data)) return_failure_int; } - last_state = game.events.keys[KEY_INTERACT]; + last_state = game.inputs.keys[KEY_INTERACT]; return EXIT_SUCCESS; } diff --git a/src/game.c b/src/game.c index ad05b16..0b56305 100644 --- a/src/game.c +++ b/src/game.c @@ -18,13 +18,13 @@ int game_init(void) event_bus_init(&game.event_bus); entity_manager_init(&game.entity_manager); - if(asset_manager_load_asset(&game.asset_manager, "player_idle_sheet", ASSET_TEXTURE)) return_failure_int; - if(asset_manager_load_asset(&game.asset_manager, "player_walk_sheet", ASSET_TEXTURE)) return_failure_int; - if(asset_manager_load_asset(&game.asset_manager, "player_run_sheet", ASSET_TEXTURE)) return_failure_int; - if(asset_manager_load_asset(&game.asset_manager, "lever_sheet", ASSET_TEXTURE)) return_failure_int; - if(asset_manager_load_asset(&game.asset_manager, "barred_door_sheet", ASSET_TEXTURE)) return_failure_int; - if(asset_manager_load_asset(&game.asset_manager, "wooden_door_sheet", ASSET_TEXTURE)) return_failure_int; - if(asset_manager_load_asset(&game.asset_manager, "tileset", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "player_idle_sheet", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "player_walk_sheet", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "player_run_sheet", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "lever_sheet", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "barred_door_sheet", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "wooden_door_sheet", ASSET_TEXTURE)) return_failure_int; + if(!asset_manager_load_asset(&game.asset_manager, "tileset", ASSET_TEXTURE)) return_failure_int; /* ======== Player ======== */ { @@ -352,9 +352,9 @@ void game_handle_event(void) while(poll_event(&event)) { if(event.type == INPUT_EVENT_KEY_DOWN) - game.events.keys[event.key] = true; + game.inputs.keys[event.key] = true; else if(event.type == INPUT_EVENT_KEY_UP) - game.events.keys[event.key] = false; + game.inputs.keys[event.key] = false; if(event.type == INPUT_EVENT_QUIT) game.is_running = false;