games/raycaster
1
0
Fork 0
Code Issues 30 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Move gui_fsm to fsm but this causes some problems.

Browse source
This commit is contained in:
Zed A. Shaw 2025-05-15 23:54:59 -04:00
parent cc44c9d37a
commit bed5ce22d2
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autowalker.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "ai.hpp" #include "ai.hpp"
#include "gui/gui_fsm.hpp" #include "gui/fsm.hpp"
struct InventoryStats; struct InventoryStats;

6
gui/gui_fsm.cpp → gui/fsm.cpp
View file

@ -1,4 +1,4 @@
#include "gui_fsm.hpp" #include "gui/fsm.hpp"
#include <iostream> #include <iostream>
#include <chrono> #include <chrono>
#include <numeric> #include <numeric>
@ -325,10 +325,10 @@ namespace gui {
autowalking = true; autowalking = true;
break; break;
case KEY::L: case KEY::L:
event(Event::STAIRS_DOWN); event(Event::LOOT_OPEN);
break; break;
case KEY::X: case KEY::X:
event(Event::LOOT_OPEN); event(Event::STAIRS_DOWN);
break; break;
default: default:
break; // ignored break; // ignored

2
gui/gui_fsm.hpp → gui/fsm.hpp
View file

@ -2,7 +2,7 @@
#include "constants.hpp" #include "constants.hpp"
#include "stats.hpp" #include "stats.hpp"
#include "levelmanager.hpp" #include "levelmanager.hpp"
#include "fsm.hpp" #include "../fsm.hpp"
#include "gui/debug_ui.hpp" #include "gui/debug_ui.hpp"
#include "gui/main_ui.hpp" #include "gui/main_ui.hpp"
#include "gui/combat_ui.hpp" #include "gui/combat_ui.hpp"

10
gui/loot_ui.cpp
View file

@ -13,11 +13,11 @@ namespace gui {
RAY_VIEW_Y+RAY_VIEW_HEIGHT/2-200, 400, 400); RAY_VIEW_Y+RAY_VIEW_HEIGHT/2-200, 400, 400);
$gui.layout( $gui.layout(
"[item_0 | item_1|item_2 | item_3]" "[item_0 | item_1 |item_2 | item_3 ]"
"[item_4 | item_5|item_6 | item_7]" "[item_4 | item_5 |item_6 | item_7 ]"
"[item_8 | item_9|item_10 | item_11]" "[item_8 | item_9 |item_10| item_11]"
"[button_12|button_13|button_14|button_15]" "[item_12| item_13|item_14|item_15 ]"
"[_ | *%(200)close|_ | _]" "[_ | %(100,50)close| _]"
); );
} }

2
main.cpp
View file

@ -1,4 +1,4 @@
#include "gui/gui_fsm.hpp" #include "gui/fsm.hpp"
#include "textures.hpp" #include "textures.hpp"
#include "sound.hpp" #include "sound.hpp"
#include "autowalker.hpp" #include "autowalker.hpp"

2
meson.build
View file

@ -97,7 +97,7 @@ sources = [
'gui/combat_ui.cpp', 'gui/combat_ui.cpp',
'gui/debug_ui.cpp', 'gui/debug_ui.cpp',
'gui/guecstra.cpp', 'gui/guecstra.cpp',
'gui/gui_fsm.cpp', 'gui/fsm.cpp',
'gui/loot_ui.cpp', 'gui/loot_ui.cpp',
'gui/main_ui.cpp', 'gui/main_ui.cpp',
'gui/overlay_ui.cpp', 'gui/overlay_ui.cpp',