Refactor before working on animations sending events.
This commit is contained in:
parent
8b1f288fce
commit
63260f01b9
7 changed files with 10 additions and 42 deletions
|
|
@ -89,7 +89,7 @@ namespace boss {
|
|||
break;
|
||||
case COMBAT_START:
|
||||
$ui.status(L"X TURN", L"STEP");
|
||||
next_combat_dumb_name();
|
||||
next_combat();
|
||||
break;
|
||||
case COMBAT:
|
||||
do_combat(data);
|
||||
|
|
@ -99,7 +99,11 @@ namespace boss {
|
|||
}
|
||||
}
|
||||
|
||||
void Fight::next_combat_dumb_name() {
|
||||
void Fight::END(game::Event ev, std::any) {
|
||||
fmt::println("BOSS_FIGHT:END event {}", (int)ev);
|
||||
}
|
||||
|
||||
void Fight::next_combat() {
|
||||
if(auto action = $battle.next()) {
|
||||
System::combat(*action, $world, $boss_id, 0);
|
||||
} else if(player_dead()) {
|
||||
|
|
@ -143,10 +147,6 @@ namespace boss {
|
|||
|
||||
}
|
||||
|
||||
void Fight::END(game::Event ev, std::any) {
|
||||
fmt::println("BOSS_FIGHT:END event {}", (int)ev);
|
||||
}
|
||||
|
||||
void Fight::run_systems() {
|
||||
$ui.update_stats();
|
||||
$battle.set($host, "tough_personality", false);
|
||||
|
|
@ -155,7 +155,6 @@ namespace boss {
|
|||
}
|
||||
|
||||
void Fight::render(sf::RenderWindow& window) {
|
||||
$ui.play_animations();
|
||||
$ui.render();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue