diff --git a/autowalker.hpp b/autowalker.hpp index f41c620..bacfb51 100644 --- a/autowalker.hpp +++ b/autowalker.hpp @@ -1,7 +1,7 @@ #pragma once #include "ai.hpp" -#include "gui/gui_fsm.hpp" +#include "gui/fsm.hpp" struct InventoryStats; diff --git a/gui/gui_fsm.cpp b/gui/fsm.cpp similarity index 99% rename from gui/gui_fsm.cpp rename to gui/fsm.cpp index 3c33938..5000a2a 100644 --- a/gui/gui_fsm.cpp +++ b/gui/fsm.cpp @@ -1,4 +1,4 @@ -#include "gui_fsm.hpp" +#include "gui/fsm.hpp" #include #include #include @@ -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 diff --git a/gui/gui_fsm.hpp b/gui/fsm.hpp similarity index 98% rename from gui/gui_fsm.hpp rename to gui/fsm.hpp index 89008dd..75fc169 100644 --- a/gui/gui_fsm.hpp +++ b/gui/fsm.hpp @@ -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" diff --git a/gui/loot_ui.cpp b/gui/loot_ui.cpp index e0460a1..b8a6c84 100644 --- a/gui/loot_ui.cpp +++ b/gui/loot_ui.cpp @@ -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| _]" ); } diff --git a/main.cpp b/main.cpp index a562ec4..1a15ed0 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -#include "gui/gui_fsm.hpp" +#include "gui/fsm.hpp" #include "textures.hpp" #include "sound.hpp" #include "autowalker.hpp" diff --git a/meson.build b/meson.build index 44bbd84..da2a8de 100644 --- a/meson.build +++ b/meson.build @@ -97,7 +97,7 @@ sources = [ 'gui/combat_ui.cpp', 'gui/debug_ui.cpp', 'gui/guecstra.cpp', - 'gui/gui_fsm.cpp', + 'gui/fsm.cpp', 'gui/loot_ui.cpp', 'gui/main_ui.cpp', 'gui/overlay_ui.cpp',