From ec59e77867391e5ec07635898ad086e7ce72c323 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sun, 23 Aug 2026 10:14:39 -0500 Subject: [PATCH] Moved files around --- src/dusk/rpg/entity/player.c | 2 +- src/dusk/save/save.c | 17 ++++++--- src/dusk/save/save.h | 9 +++++ src/dusk/scene/mainmenu/scenemainmenu.c | 2 +- src/dusk/ui/CMakeLists.txt | 3 +- src/dusk/ui/dialog/CMakeLists.txt | 12 ++++++ src/dusk/ui/dialog/keyboard/CMakeLists.txt | 12 ++++++ .../{widget => dialog/keyboard}/uikeyboard.c | 4 +- .../{widget => dialog/keyboard}/uikeyboard.h | 0 .../ui/dialog/keyboard/uikeyboardnumbers.c | 24 ++++++++++++ .../ui/dialog/keyboard/uikeyboardnumbers.h | 37 +++++++++++++++++++ .../ui/dialog/keyboard/uikeyboardqwerty.c | 24 ++++++++++++ .../ui/dialog/keyboard/uikeyboardqwerty.h | 37 +++++++++++++++++++ .../ui/dialog/keyboard/uikeyboardsymbols.c | 24 ++++++++++++ .../ui/dialog/keyboard/uikeyboardsymbols.h | 37 +++++++++++++++++++ .../ui/{frame => dialog}/save/CMakeLists.txt | 0 .../ui/{frame => dialog}/save/uisaveslot.c | 0 .../ui/{frame => dialog}/save/uisaveslot.h | 0 .../ui/{frame => dialog}/save/uiselectsave.c | 2 +- .../ui/{frame => dialog}/save/uiselectsave.h | 2 +- src/dusk/ui/{frame => dialog}/uiconfirm.c | 0 src/dusk/ui/{frame => dialog}/uiconfirm.h | 0 src/dusk/ui/{frame => screen}/CMakeLists.txt | 8 +--- .../{frame => screen}/backpack/CMakeLists.txt | 0 .../{frame => screen}/backpack/uibackpack.c | 0 .../{frame => screen}/backpack/uibackpack.h | 0 .../{frame => screen}/battle/CMakeLists.txt | 0 .../ui/{frame => screen}/battle/uibattlehud.c | 0 .../ui/{frame => screen}/battle/uibattlehud.h | 0 .../{frame => screen}/battle/uibattlemenu.c | 0 .../{frame => screen}/battle/uibattlemenu.h | 0 .../ui/{frame => screen}/game/CMakeLists.txt | 0 .../ui/{frame => screen}/game/uigamemenu.c | 4 +- .../ui/{frame => screen}/game/uigamemenu.h | 0 .../{frame => screen}/mainmenu/CMakeLists.txt | 0 .../{frame => screen}/mainmenu/uimainmenu.c | 8 +++- .../{frame => screen}/mainmenu/uimainmenu.h | 0 src/dusk/ui/uielementlist.c | 16 ++++---- src/dusk/ui/widget/CMakeLists.txt | 1 - 39 files changed, 252 insertions(+), 33 deletions(-) create mode 100644 src/dusk/ui/dialog/CMakeLists.txt create mode 100644 src/dusk/ui/dialog/keyboard/CMakeLists.txt rename src/dusk/ui/{widget => dialog/keyboard}/uikeyboard.c (78%) rename src/dusk/ui/{widget => dialog/keyboard}/uikeyboard.h (100%) create mode 100644 src/dusk/ui/dialog/keyboard/uikeyboardnumbers.c create mode 100644 src/dusk/ui/dialog/keyboard/uikeyboardnumbers.h create mode 100644 src/dusk/ui/dialog/keyboard/uikeyboardqwerty.c create mode 100644 src/dusk/ui/dialog/keyboard/uikeyboardqwerty.h create mode 100644 src/dusk/ui/dialog/keyboard/uikeyboardsymbols.c create mode 100644 src/dusk/ui/dialog/keyboard/uikeyboardsymbols.h rename src/dusk/ui/{frame => dialog}/save/CMakeLists.txt (100%) rename src/dusk/ui/{frame => dialog}/save/uisaveslot.c (100%) rename src/dusk/ui/{frame => dialog}/save/uisaveslot.h (100%) rename src/dusk/ui/{frame => dialog}/save/uiselectsave.c (99%) rename src/dusk/ui/{frame => dialog}/save/uiselectsave.h (99%) rename src/dusk/ui/{frame => dialog}/uiconfirm.c (100%) rename src/dusk/ui/{frame => dialog}/uiconfirm.h (100%) rename src/dusk/ui/{frame => screen}/CMakeLists.txt (62%) rename src/dusk/ui/{frame => screen}/backpack/CMakeLists.txt (100%) rename src/dusk/ui/{frame => screen}/backpack/uibackpack.c (100%) rename src/dusk/ui/{frame => screen}/backpack/uibackpack.h (100%) rename src/dusk/ui/{frame => screen}/battle/CMakeLists.txt (100%) rename src/dusk/ui/{frame => screen}/battle/uibattlehud.c (100%) rename src/dusk/ui/{frame => screen}/battle/uibattlehud.h (100%) rename src/dusk/ui/{frame => screen}/battle/uibattlemenu.c (100%) rename src/dusk/ui/{frame => screen}/battle/uibattlemenu.h (100%) rename src/dusk/ui/{frame => screen}/game/CMakeLists.txt (100%) rename src/dusk/ui/{frame => screen}/game/uigamemenu.c (98%) rename src/dusk/ui/{frame => screen}/game/uigamemenu.h (100%) rename src/dusk/ui/{frame => screen}/mainmenu/CMakeLists.txt (100%) rename src/dusk/ui/{frame => screen}/mainmenu/uimainmenu.c (95%) rename src/dusk/ui/{frame => screen}/mainmenu/uimainmenu.h (100%) diff --git a/src/dusk/rpg/entity/player.c b/src/dusk/rpg/entity/player.c index 632f726b..c3ff2119 100644 --- a/src/dusk/rpg/entity/player.c +++ b/src/dusk/rpg/entity/player.c @@ -11,7 +11,7 @@ #include "util/memory.h" #include "time/time.h" #include "ui/focus/uifocus.h" -#include "ui/frame/game/uigamemenu.h" +#include "ui/screen/game/uigamemenu.h" #include "rpg/cutscene/cutscenesystem.h" void playerInit(entity_t *entity) { diff --git a/src/dusk/save/save.c b/src/dusk/save/save.c index ba49c46e..71028594 100644 --- a/src/dusk/save/save.c +++ b/src/dusk/save/save.c @@ -65,12 +65,7 @@ errorret_t saveUpdate() { } else { // Device was found, cache in the data. errorChain(saveLoadSettings()); - // Reset each slot and try load from file, updating cache along the way. - for(uint8_t i = 0; i < SAVE_SLOT_COUNT; i++) { - SAVE.slotCurrent = i; - saveSlotInit(&SAVE.slot); - errorChain(saveLoadSlot());// Load slot updates the cache. - } + errorChain(saveLoadAllSlots()); // Reset slot, implying no slot has been selected. SAVE.slotCurrent = 0xFF; @@ -229,6 +224,16 @@ errorret_t saveLoadSlot() { errorOk(); } +errorret_t saveLoadAllSlots() { + for(uint8_t i = 0; i < SAVE_SLOT_COUNT; i++) { + SAVE.slotCurrent = i; + saveSlotInit(&SAVE.slot); + errorChain(saveLoadSlot());// Load slot updates the cache. + } + + errorOk(); +} + errorret_t saveDispose() { // Dispose each device. savedevice_t *device = &SAVE.devices[0]; diff --git a/src/dusk/save/save.h b/src/dusk/save/save.h index 71f91a42..5618f581 100644 --- a/src/dusk/save/save.h +++ b/src/dusk/save/save.h @@ -95,6 +95,15 @@ errorret_t saveSaveSlot(); */ errorret_t saveLoadSlot(); +/** + * Resets and loads every slot from the current device, updating the caches + * along the way. Leaves SAVE.slotCurrent pointing at the last slot index + * once done. + * + * @return Error state if any. + */ +errorret_t saveLoadAllSlots(); + /** * Disposes of the save system. * diff --git a/src/dusk/scene/mainmenu/scenemainmenu.c b/src/dusk/scene/mainmenu/scenemainmenu.c index cc923b3c..f1f8299f 100644 --- a/src/dusk/scene/mainmenu/scenemainmenu.c +++ b/src/dusk/scene/mainmenu/scenemainmenu.c @@ -6,7 +6,7 @@ */ #include "scenemainmenu.h" -#include "ui/frame/mainmenu/uimainmenu.h" +#include "ui/screen/mainmenu/uimainmenu.h" errorret_t sceneMainMenuInit(scenedata_t *sceneData) { uiMainMenuOpen(); diff --git a/src/dusk/ui/CMakeLists.txt b/src/dusk/ui/CMakeLists.txt index 1dd15832..ac7639b2 100644 --- a/src/dusk/ui/CMakeLists.txt +++ b/src/dusk/ui/CMakeLists.txt @@ -4,7 +4,8 @@ # https://opensource.org/licenses/MIT add_subdirectory(debug) -add_subdirectory(frame) +add_subdirectory(dialog) +add_subdirectory(screen) add_subdirectory(focus) add_subdirectory(overlay) add_subdirectory(rpg) diff --git a/src/dusk/ui/dialog/CMakeLists.txt b/src/dusk/ui/dialog/CMakeLists.txt new file mode 100644 index 00000000..bfaab3ef --- /dev/null +++ b/src/dusk/ui/dialog/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (c) 2026 Dominic Masters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +target_sources(${DUSK_LIBRARY_TARGET_NAME} + PUBLIC + uiconfirm.c +) + +add_subdirectory(save) +add_subdirectory(keyboard) \ No newline at end of file diff --git a/src/dusk/ui/dialog/keyboard/CMakeLists.txt b/src/dusk/ui/dialog/keyboard/CMakeLists.txt new file mode 100644 index 00000000..26276b29 --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (c) 2026 Dominic Masters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +target_sources(${DUSK_LIBRARY_TARGET_NAME} + PUBLIC + uikeyboard.c + uikeyboardqwerty.c + uikeyboardnumbers.c + uikeyboardsymbols.c +) diff --git a/src/dusk/ui/widget/uikeyboard.c b/src/dusk/ui/dialog/keyboard/uikeyboard.c similarity index 78% rename from src/dusk/ui/widget/uikeyboard.c rename to src/dusk/ui/dialog/keyboard/uikeyboard.c index 825d851d..3fda2199 100644 --- a/src/dusk/ui/widget/uikeyboard.c +++ b/src/dusk/ui/dialog/keyboard/uikeyboard.c @@ -6,12 +6,12 @@ */ #include "uikeyboard.h" -#include "util/memory.h" uikeyboard_t UI_KEYBOARD; errorret_t uiKeyboardInit(void) { - memoryZero(&UI_KEYBOARD, sizeof(uikeyboard_t)); + // Nothing to initialize yet -- uikeyboard_t is currently a + // placeholder with no fields. errorOk(); } diff --git a/src/dusk/ui/widget/uikeyboard.h b/src/dusk/ui/dialog/keyboard/uikeyboard.h similarity index 100% rename from src/dusk/ui/widget/uikeyboard.h rename to src/dusk/ui/dialog/keyboard/uikeyboard.h diff --git a/src/dusk/ui/dialog/keyboard/uikeyboardnumbers.c b/src/dusk/ui/dialog/keyboard/uikeyboardnumbers.c new file mode 100644 index 00000000..a885f95e --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/uikeyboardnumbers.c @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2026 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#include "uikeyboardnumbers.h" + +uikeyboardnumbers_t UI_KEYBOARD_NUMBERS; + +errorret_t uiKeyboardNumbersInit(void) { + // Nothing to initialize yet -- uikeyboardnumbers_t is currently a + // placeholder with no fields. + errorOk(); +} + +errorret_t uiKeyboardNumbersDraw(void) { + errorOk(); +} + +errorret_t uiKeyboardNumbersDispose(void) { + errorOk(); +} diff --git a/src/dusk/ui/dialog/keyboard/uikeyboardnumbers.h b/src/dusk/ui/dialog/keyboard/uikeyboardnumbers.h new file mode 100644 index 00000000..c39291a4 --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/uikeyboardnumbers.h @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2026 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#pragma once +#include "error/error.h" + +typedef struct { + +} uikeyboardnumbers_t; + +extern uikeyboardnumbers_t UI_KEYBOARD_NUMBERS; + +/** + * Initializes the numbers keyboard layout. Currently a placeholder -- + * no behavior implemented yet. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardNumbersInit(void); + +/** + * Draws the numbers keyboard layout. Currently a placeholder -- no-op. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardNumbersDraw(void); + +/** + * Disposes of the numbers keyboard layout. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardNumbersDispose(void); diff --git a/src/dusk/ui/dialog/keyboard/uikeyboardqwerty.c b/src/dusk/ui/dialog/keyboard/uikeyboardqwerty.c new file mode 100644 index 00000000..350e5179 --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/uikeyboardqwerty.c @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2026 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#include "uikeyboardqwerty.h" + +uikeyboardqwerty_t UI_KEYBOARD_QWERTY; + +errorret_t uiKeyboardQwertyInit(void) { + // Nothing to initialize yet -- uikeyboardqwerty_t is currently a + // placeholder with no fields. + errorOk(); +} + +errorret_t uiKeyboardQwertyDraw(void) { + errorOk(); +} + +errorret_t uiKeyboardQwertyDispose(void) { + errorOk(); +} diff --git a/src/dusk/ui/dialog/keyboard/uikeyboardqwerty.h b/src/dusk/ui/dialog/keyboard/uikeyboardqwerty.h new file mode 100644 index 00000000..5b0de032 --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/uikeyboardqwerty.h @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2026 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#pragma once +#include "error/error.h" + +typedef struct { + +} uikeyboardqwerty_t; + +extern uikeyboardqwerty_t UI_KEYBOARD_QWERTY; + +/** + * Initializes the QWERTY keyboard layout. Currently a placeholder -- + * no behavior implemented yet. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardQwertyInit(void); + +/** + * Draws the QWERTY keyboard layout. Currently a placeholder -- no-op. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardQwertyDraw(void); + +/** + * Disposes of the QWERTY keyboard layout. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardQwertyDispose(void); diff --git a/src/dusk/ui/dialog/keyboard/uikeyboardsymbols.c b/src/dusk/ui/dialog/keyboard/uikeyboardsymbols.c new file mode 100644 index 00000000..1a85476f --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/uikeyboardsymbols.c @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2026 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#include "uikeyboardsymbols.h" + +uikeyboardsymbols_t UI_KEYBOARD_SYMBOLS; + +errorret_t uiKeyboardSymbolsInit(void) { + // Nothing to initialize yet -- uikeyboardsymbols_t is currently a + // placeholder with no fields. + errorOk(); +} + +errorret_t uiKeyboardSymbolsDraw(void) { + errorOk(); +} + +errorret_t uiKeyboardSymbolsDispose(void) { + errorOk(); +} diff --git a/src/dusk/ui/dialog/keyboard/uikeyboardsymbols.h b/src/dusk/ui/dialog/keyboard/uikeyboardsymbols.h new file mode 100644 index 00000000..224b876b --- /dev/null +++ b/src/dusk/ui/dialog/keyboard/uikeyboardsymbols.h @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2026 Dominic Masters + * + * This software is released under the MIT License. + * https://opensource.org/licenses/MIT + */ + +#pragma once +#include "error/error.h" + +typedef struct { + +} uikeyboardsymbols_t; + +extern uikeyboardsymbols_t UI_KEYBOARD_SYMBOLS; + +/** + * Initializes the symbols keyboard layout. Currently a placeholder -- + * no behavior implemented yet. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardSymbolsInit(void); + +/** + * Draws the symbols keyboard layout. Currently a placeholder -- no-op. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardSymbolsDraw(void); + +/** + * Disposes of the symbols keyboard layout. + * + * @return Any error that occurs. + */ +errorret_t uiKeyboardSymbolsDispose(void); diff --git a/src/dusk/ui/frame/save/CMakeLists.txt b/src/dusk/ui/dialog/save/CMakeLists.txt similarity index 100% rename from src/dusk/ui/frame/save/CMakeLists.txt rename to src/dusk/ui/dialog/save/CMakeLists.txt diff --git a/src/dusk/ui/frame/save/uisaveslot.c b/src/dusk/ui/dialog/save/uisaveslot.c similarity index 100% rename from src/dusk/ui/frame/save/uisaveslot.c rename to src/dusk/ui/dialog/save/uisaveslot.c diff --git a/src/dusk/ui/frame/save/uisaveslot.h b/src/dusk/ui/dialog/save/uisaveslot.h similarity index 100% rename from src/dusk/ui/frame/save/uisaveslot.h rename to src/dusk/ui/dialog/save/uisaveslot.h diff --git a/src/dusk/ui/frame/save/uiselectsave.c b/src/dusk/ui/dialog/save/uiselectsave.c similarity index 99% rename from src/dusk/ui/frame/save/uiselectsave.c rename to src/dusk/ui/dialog/save/uiselectsave.c index c6b4eae7..1674879c 100644 --- a/src/dusk/ui/frame/save/uiselectsave.c +++ b/src/dusk/ui/dialog/save/uiselectsave.c @@ -7,7 +7,7 @@ #include "uiselectsave.h" #include "ui/widget/uiframe.h" -#include "ui/frame/uiconfirm.h" +#include "ui/dialog/uiconfirm.h" #include "save/save.h" #include "time/timeepoch.h" #include "assert/assert.h" diff --git a/src/dusk/ui/frame/save/uiselectsave.h b/src/dusk/ui/dialog/save/uiselectsave.h similarity index 99% rename from src/dusk/ui/frame/save/uiselectsave.h rename to src/dusk/ui/dialog/save/uiselectsave.h index 36314c62..4997767d 100644 --- a/src/dusk/ui/frame/save/uiselectsave.h +++ b/src/dusk/ui/dialog/save/uiselectsave.h @@ -10,7 +10,7 @@ #include "ui/widget/uilabel.h" #include "ui/widget/uimenu.h" #include "ui/widget/uiscrolling.h" -#include "ui/frame/save/uisaveslot.h" +#include "ui/dialog/save/uisaveslot.h" #include "save/saveslot.h" #define UI_SELECT_SAVE_TITLE_TEXT_MAX 64 diff --git a/src/dusk/ui/frame/uiconfirm.c b/src/dusk/ui/dialog/uiconfirm.c similarity index 100% rename from src/dusk/ui/frame/uiconfirm.c rename to src/dusk/ui/dialog/uiconfirm.c diff --git a/src/dusk/ui/frame/uiconfirm.h b/src/dusk/ui/dialog/uiconfirm.h similarity index 100% rename from src/dusk/ui/frame/uiconfirm.h rename to src/dusk/ui/dialog/uiconfirm.h diff --git a/src/dusk/ui/frame/CMakeLists.txt b/src/dusk/ui/screen/CMakeLists.txt similarity index 62% rename from src/dusk/ui/frame/CMakeLists.txt rename to src/dusk/ui/screen/CMakeLists.txt index 20d34c27..6934dc3b 100644 --- a/src/dusk/ui/frame/CMakeLists.txt +++ b/src/dusk/ui/screen/CMakeLists.txt @@ -3,13 +3,7 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT -target_sources(${DUSK_LIBRARY_TARGET_NAME} - PUBLIC - uiconfirm.c -) - add_subdirectory(game) add_subdirectory(mainmenu) add_subdirectory(battle) -add_subdirectory(backpack) -add_subdirectory(save) \ No newline at end of file +add_subdirectory(backpack) \ No newline at end of file diff --git a/src/dusk/ui/frame/backpack/CMakeLists.txt b/src/dusk/ui/screen/backpack/CMakeLists.txt similarity index 100% rename from src/dusk/ui/frame/backpack/CMakeLists.txt rename to src/dusk/ui/screen/backpack/CMakeLists.txt diff --git a/src/dusk/ui/frame/backpack/uibackpack.c b/src/dusk/ui/screen/backpack/uibackpack.c similarity index 100% rename from src/dusk/ui/frame/backpack/uibackpack.c rename to src/dusk/ui/screen/backpack/uibackpack.c diff --git a/src/dusk/ui/frame/backpack/uibackpack.h b/src/dusk/ui/screen/backpack/uibackpack.h similarity index 100% rename from src/dusk/ui/frame/backpack/uibackpack.h rename to src/dusk/ui/screen/backpack/uibackpack.h diff --git a/src/dusk/ui/frame/battle/CMakeLists.txt b/src/dusk/ui/screen/battle/CMakeLists.txt similarity index 100% rename from src/dusk/ui/frame/battle/CMakeLists.txt rename to src/dusk/ui/screen/battle/CMakeLists.txt diff --git a/src/dusk/ui/frame/battle/uibattlehud.c b/src/dusk/ui/screen/battle/uibattlehud.c similarity index 100% rename from src/dusk/ui/frame/battle/uibattlehud.c rename to src/dusk/ui/screen/battle/uibattlehud.c diff --git a/src/dusk/ui/frame/battle/uibattlehud.h b/src/dusk/ui/screen/battle/uibattlehud.h similarity index 100% rename from src/dusk/ui/frame/battle/uibattlehud.h rename to src/dusk/ui/screen/battle/uibattlehud.h diff --git a/src/dusk/ui/frame/battle/uibattlemenu.c b/src/dusk/ui/screen/battle/uibattlemenu.c similarity index 100% rename from src/dusk/ui/frame/battle/uibattlemenu.c rename to src/dusk/ui/screen/battle/uibattlemenu.c diff --git a/src/dusk/ui/frame/battle/uibattlemenu.h b/src/dusk/ui/screen/battle/uibattlemenu.h similarity index 100% rename from src/dusk/ui/frame/battle/uibattlemenu.h rename to src/dusk/ui/screen/battle/uibattlemenu.h diff --git a/src/dusk/ui/frame/game/CMakeLists.txt b/src/dusk/ui/screen/game/CMakeLists.txt similarity index 100% rename from src/dusk/ui/frame/game/CMakeLists.txt rename to src/dusk/ui/screen/game/CMakeLists.txt diff --git a/src/dusk/ui/frame/game/uigamemenu.c b/src/dusk/ui/screen/game/uigamemenu.c similarity index 98% rename from src/dusk/ui/frame/game/uigamemenu.c rename to src/dusk/ui/screen/game/uigamemenu.c index e92d48a7..a0284375 100644 --- a/src/dusk/ui/frame/game/uigamemenu.c +++ b/src/dusk/ui/screen/game/uigamemenu.c @@ -7,8 +7,8 @@ #include "uigamemenu.h" #include "ui/widget/uiframe.h" -#include "ui/frame/uiconfirm.h" -#include "ui/frame/backpack/uibackpack.h" +#include "ui/dialog/uiconfirm.h" +#include "ui/screen/backpack/uibackpack.h" #include "ui/rpg/textbox/uitextboxmain.h" #include "util/memory.h" #include "display/spritebatch/spritebatch.h" diff --git a/src/dusk/ui/frame/game/uigamemenu.h b/src/dusk/ui/screen/game/uigamemenu.h similarity index 100% rename from src/dusk/ui/frame/game/uigamemenu.h rename to src/dusk/ui/screen/game/uigamemenu.h diff --git a/src/dusk/ui/frame/mainmenu/CMakeLists.txt b/src/dusk/ui/screen/mainmenu/CMakeLists.txt similarity index 100% rename from src/dusk/ui/frame/mainmenu/CMakeLists.txt rename to src/dusk/ui/screen/mainmenu/CMakeLists.txt diff --git a/src/dusk/ui/frame/mainmenu/uimainmenu.c b/src/dusk/ui/screen/mainmenu/uimainmenu.c similarity index 95% rename from src/dusk/ui/frame/mainmenu/uimainmenu.c rename to src/dusk/ui/screen/mainmenu/uimainmenu.c index ad0c6ba2..7810c4c6 100644 --- a/src/dusk/ui/frame/mainmenu/uimainmenu.c +++ b/src/dusk/ui/screen/mainmenu/uimainmenu.c @@ -15,9 +15,10 @@ #include "assert/assert.h" #include "locale/localemanager.h" #include "asset/loader/locale/assetlocaleloader.h" -#include "ui/frame/uiconfirm.h" -#include "ui/frame/save/uiselectsave.h" +#include "ui/dialog/uiconfirm.h" +#include "ui/dialog/save/uiselectsave.h" #include "scene/scene.h" +#include "save/save.h" #define UI_MAIN_MENU_INDEX_START_GAME 0 #define UI_MAIN_MENU_INDEX_OPTIONS 1 @@ -48,6 +49,9 @@ void uiMainMenuSelected( switch(index) { case UI_MAIN_MENU_INDEX_START_GAME: uiMenuClose(&UI_MAIN_MENU.menu); + + errorCatch(errorPrint(saveLoadAllSlots())); + uiSelectSaveOpen( UI_SELECT_SAVE_TYPE_LOAD, uiMainMenuSelectSaveResult, NULL ); diff --git a/src/dusk/ui/frame/mainmenu/uimainmenu.h b/src/dusk/ui/screen/mainmenu/uimainmenu.h similarity index 100% rename from src/dusk/ui/frame/mainmenu/uimainmenu.h rename to src/dusk/ui/screen/mainmenu/uimainmenu.h diff --git a/src/dusk/ui/uielementlist.c b/src/dusk/ui/uielementlist.c index f69e4149..ac0e5651 100644 --- a/src/dusk/ui/uielementlist.c +++ b/src/dusk/ui/uielementlist.c @@ -14,15 +14,15 @@ #include "ui/overlay/uicrop.h" #include "ui/transition/uitransition.h" #include "ui/debug/uiconsole.h" -#include "ui/frame/game/uigamemenu.h" -#include "ui/frame/mainmenu/uimainmenu.h" -#include "ui/frame/battle/uibattlemenu.h" -#include "ui/frame/battle/uibattlehud.h" -#include "ui/frame/backpack/uibackpack.h" -#include "ui/frame/uiconfirm.h" +#include "ui/screen/game/uigamemenu.h" +#include "ui/screen/mainmenu/uimainmenu.h" +#include "ui/screen/battle/uibattlemenu.h" +#include "ui/screen/battle/uibattlehud.h" +#include "ui/screen/backpack/uibackpack.h" +#include "ui/dialog/uiconfirm.h" #include "ui/widget/uimodal.h" -#include "ui/widget/uikeyboard.h" -#include "ui/frame/save/uiselectsave.h" +#include "ui/dialog/keyboard/uikeyboard.h" +#include "ui/dialog/save/uiselectsave.h" #include "ui/rpg/textbox/uitextboxmain.h" #include "ui/rpg/textbox/uitextboxminilist.h" #include "ui/rpg/uiemoji.h" diff --git a/src/dusk/ui/widget/CMakeLists.txt b/src/dusk/ui/widget/CMakeLists.txt index feff8956..e15d658a 100644 --- a/src/dusk/ui/widget/CMakeLists.txt +++ b/src/dusk/ui/widget/CMakeLists.txt @@ -15,7 +15,6 @@ target_sources(${DUSK_LIBRARY_TARGET_NAME} uiscrolling.c uiitem.c uiitemlist.c - uikeyboard.c uimenu.c uimodal.c )