Finally unified all of my events into one place.
This commit is contained in:
parent
6c34fea64a
commit
c618a4828f
30 changed files with 215 additions and 216 deletions
|
|
@ -3,7 +3,7 @@
|
|||
#include "simplefsm.hpp"
|
||||
#include "dinkyecs.hpp"
|
||||
#include "boss/ui.hpp"
|
||||
#include "gui/fsm_events.hpp"
|
||||
#include "events.hpp"
|
||||
#include "battle.hpp"
|
||||
#include <memory>
|
||||
#include <any>
|
||||
|
|
@ -20,7 +20,7 @@ namespace boss {
|
|||
END=4
|
||||
};
|
||||
|
||||
class Fight : public DeadSimpleFSM<State, gui::Event> {
|
||||
class Fight : public DeadSimpleFSM<State, game::Event> {
|
||||
public:
|
||||
shared_ptr<World> $world = nullptr;
|
||||
DinkyECS::Entity $boss_id = NONE;
|
||||
|
|
@ -32,14 +32,14 @@ namespace boss {
|
|||
|
||||
Fight(shared_ptr<World> world, Entity boss_id, Entity player_id);
|
||||
|
||||
bool handle_mouse(gui::Event ev);
|
||||
bool event(gui::Event ev, std::any data);
|
||||
bool handle_mouse(game::Event ev);
|
||||
bool event(game::Event ev, std::any data);
|
||||
|
||||
void START(gui::Event ev, std::any data);
|
||||
void PLAYER_REQUESTS(gui::Event ev, std::any data);
|
||||
void PLAN_BATTLE(gui::Event ev, std::any data);
|
||||
void EXEC_PLAN(gui::Event ev, std::any data);
|
||||
void END(gui::Event ev, std::any data);
|
||||
void START(game::Event ev, std::any data);
|
||||
void PLAYER_REQUESTS(game::Event ev, std::any data);
|
||||
void PLAN_BATTLE(game::Event ev, std::any data);
|
||||
void EXEC_PLAN(game::Event ev, std::any data);
|
||||
void END(game::Event ev, std::any data);
|
||||
void render(sf::RenderWindow& window);
|
||||
|
||||
void handle_world_events();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue