From 2ac7007cb834e5f2f91e9cda3c953810c01f9115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 29 Apr 2020 00:43:52 +0200 Subject: [PATCH] fixing the health doesn't get affected by the health lost in combat --- include/systems/inventory.h | 1 + src/systems/combat_manager.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/systems/inventory.h b/include/systems/inventory.h index 1b4074f..d4beb95 100644 --- a/include/systems/inventory.h +++ b/include/systems/inventory.h @@ -10,6 +10,7 @@ #include "engine.h" #include +#include "renderer.h" void display_inv_slot(gc_scene *scene, struct renderer *rend, int nb); bool toggle_inventory(gc_engine *engine); diff --git a/src/systems/combat_manager.c b/src/systems/combat_manager.c index be51ed5..3308242 100644 --- a/src/systems/combat_manager.c +++ b/src/systems/combat_manager.c @@ -33,8 +33,8 @@ void entity_moved(gc_engine *engine, va_list args) void combat_end(gc_engine *engine, bool has_won) { struct combat_manager *this = GETSYS(engine, combat_manager); - gc_entity *player = engine->scene->get_entity(engine->scene, 50); - gc_entity *player_combat = this->game_scene->get_entity(this->game_scene, 50); + gc_entity *player_combat = engine->scene->get_entity(engine->scene, 50); + gc_entity *player = this->game_scene->get_entity(this->game_scene, 50); struct dialog_manager *dialog = GETSYS(engine, dialog_manager); if (!this->current_enemy || !player || ! player_combat || !dialog)