diff --git a/events.hpp b/events.hpp index c5b810d..38cc923 100644 --- a/events.hpp +++ b/events.hpp @@ -5,7 +5,7 @@ namespace Events { START, COMBAT, DEATH, STAIRS_UP, STAIRS_DOWN, TRAP, COMBAT_START, NO_NEIGHBORS, HP_STATUS, ATTACK, NEW_RITUAL, - UPDATE_SPRITE, ENEMY_SPAWN, NOOP, + UPDATE_SPRITE, ENTITY_SPAWN, NOOP, LOOT_ITEM, LOOT_CONTAINER, LOOT_CLOSE, LOOT_SELECT, INV_SELECT, AIM_CLICK }; diff --git a/gui/debug_ui.cpp b/gui/debug_ui.cpp index 1368364..014f243 100644 --- a/gui/debug_ui.cpp +++ b/gui/debug_ui.cpp @@ -42,7 +42,7 @@ namespace gui { void DebugUI::spawn(std::string enemy_key) { auto ent = $level_mgr.spawn_enemy(enemy_key); auto& level = $level_mgr.current(); - level.world->send(Events::GUI::ENEMY_SPAWN, ent, {}); + level.world->send(Events::GUI::ENTITY_SPAWN, ent, {}); } void DebugUI::render(sf::RenderWindow& window) { diff --git a/gui/fsm.cpp b/gui/fsm.cpp index e742410..c4f5778 100644 --- a/gui/fsm.cpp +++ b/gui/fsm.cpp @@ -446,7 +446,7 @@ namespace gui { case eGUI::COMBAT_START: event(Event::START_COMBAT); break; - case eGUI::ENEMY_SPAWN: + case eGUI::ENTITY_SPAWN: $main_ui.$rayview.update_level($level); $main_ui.dirty(); run_systems(); diff --git a/systems.cpp b/systems.cpp index bf6cc9c..d92fef9 100644 --- a/systems.cpp +++ b/systems.cpp @@ -515,7 +515,7 @@ bool System::drop_item(GameLevel& level, Entity item) { collision.insert(pos.location, item); // BUG: really there should be another system that handles loot->inv moves if(player_inv.has(item)) player_inv.remove(item); - level.world->send(Events::GUI::ENEMY_SPAWN, item, {}); + level.world->send(Events::GUI::ENTITY_SPAWN, item, {}); level.world->not_constant(item); return true; }