Start of V1 combat system where you get locked into combat when in range and have to work the turn system to get out.
This commit is contained in:
parent
d2700d2928
commit
8a6b38c1a4
5 changed files with 51 additions and 18 deletions
8
main.cpp
8
main.cpp
|
@ -8,14 +8,16 @@ int main() {
|
|||
main.render();
|
||||
|
||||
// ZED: need to sort out how to deal with this in the FSM
|
||||
if(main.in_state(gui::State::IDLE)) {
|
||||
main.keyboard();
|
||||
} else if(main.in_state(gui::State::MAPPING)) {
|
||||
if(main.in_state(gui::State::IDLE)
|
||||
|| main.in_state(gui::State::MAPPING)
|
||||
|| main.in_state(gui::State::IN_COMBAT))
|
||||
{
|
||||
main.keyboard();
|
||||
} else{
|
||||
main.event(gui::Event::TICK);
|
||||
}
|
||||
|
||||
main.handle_world_events();
|
||||
main.mouse();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue