Move gui_fsm to fsm but this causes some problems.
This commit is contained in:
parent
cc44c9d37a
commit
bed5ce22d2
6 changed files with 12 additions and 12 deletions
|
@ -1,4 +1,4 @@
|
|||
#include "gui_fsm.hpp"
|
||||
#include "gui/fsm.hpp"
|
||||
#include <iostream>
|
||||
#include <chrono>
|
||||
#include <numeric>
|
||||
|
@ -325,10 +325,10 @@ namespace gui {
|
|||
autowalking = true;
|
||||
break;
|
||||
case KEY::L:
|
||||
event(Event::STAIRS_DOWN);
|
||||
event(Event::LOOT_OPEN);
|
||||
break;
|
||||
case KEY::X:
|
||||
event(Event::LOOT_OPEN);
|
||||
event(Event::STAIRS_DOWN);
|
||||
break;
|
||||
default:
|
||||
break; // ignored
|
|
@ -2,7 +2,7 @@
|
|||
#include "constants.hpp"
|
||||
#include "stats.hpp"
|
||||
#include "levelmanager.hpp"
|
||||
#include "fsm.hpp"
|
||||
#include "../fsm.hpp"
|
||||
#include "gui/debug_ui.hpp"
|
||||
#include "gui/main_ui.hpp"
|
||||
#include "gui/combat_ui.hpp"
|
|
@ -13,11 +13,11 @@ namespace gui {
|
|||
RAY_VIEW_Y+RAY_VIEW_HEIGHT/2-200, 400, 400);
|
||||
|
||||
$gui.layout(
|
||||
"[item_0 | item_1|item_2 | item_3]"
|
||||
"[item_4 | item_5|item_6 | item_7]"
|
||||
"[item_8 | item_9|item_10 | item_11]"
|
||||
"[button_12|button_13|button_14|button_15]"
|
||||
"[_ | *%(200)close|_ | _]"
|
||||
"[item_0 | item_1 |item_2 | item_3 ]"
|
||||
"[item_4 | item_5 |item_6 | item_7 ]"
|
||||
"[item_8 | item_9 |item_10| item_11]"
|
||||
"[item_12| item_13|item_14|item_15 ]"
|
||||
"[_ | %(100,50)close| _]"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue