mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 23:10:14 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into trade_cleanup

Browse Source
This commit is contained in:
Pepe20129 2025-01-29 16:19:43 +01:00
commit 48f1629988
40 changed files with 119 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
View File

@ -4,7 +4,7 @@
#include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/parameter_static/parameter_static.h"
#include "assets/soh_assets.h" #include "assets/soh_assets.h"
#include "soh/ImGuiUtils.h" #include "soh/SohGui/ImGuiUtils.h"
extern "C" { extern "C" {
#include "macros.h" #include "macros.h"

2
soh/soh/Enhancements/audio/AudioEditor.cpp
View File

@ -11,7 +11,7 @@
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#include <utils/StringHelper.h> #include <utils/StringHelper.h>
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "AudioCollection.h" #include "AudioCollection.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"

2
soh/soh/Enhancements/controls/InputViewer.cpp
View File

@ -9,7 +9,7 @@
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <cmath> #include <cmath>
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
// Text colors // Text colors
static ImVec4 textColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); static ImVec4 textColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);

2
soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View File

@ -1,7 +1,7 @@
#include "SohInputEditorWindow.h" #include "SohInputEditorWindow.h"
#include <utils/StringHelper.h> #include <utils/StringHelper.h>
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "z64.h" #include "z64.h"
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#ifndef __WIIU__ #ifndef __WIIU__

2
soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
View File

@ -10,7 +10,7 @@
#include <algorithm> #include <algorithm>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/ResourceManagerHelpers.h" #include "soh/ResourceManagerHelpers.h"

2
soh/soh/Enhancements/debugger/MessageViewer.cpp
View File

@ -1,6 +1,6 @@
#include "MessageViewer.h" #include "MessageViewer.h"
#include <soh/UIWidgets.hpp> #include <soh/SohGui/UIWidgets.hpp>
#include <textures/message_static/message_static.h> #include <textures/message_static/message_static.h>
#include "../custom-message/CustomMessageManager.h" #include "../custom-message/CustomMessageManager.h"

2
soh/soh/Enhancements/debugger/actorViewer.cpp
View File

@ -1,6 +1,6 @@
#include "actorViewer.h" #include "actorViewer.h"
#include "../../util.h" #include "../../util.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "soh/ActorDB.h" #include "soh/ActorDB.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/nametag.h" #include "soh/Enhancements/nametag.h"

2
soh/soh/Enhancements/debugger/colViewer.cpp
View File

@ -1,6 +1,6 @@
#include "colViewer.h" #include "colViewer.h"
#include "../../frame_interpolation.h" #include "../../frame_interpolation.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <vector> #include <vector>
#include <string> #include <string>

8
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
View File

@ -1,8 +1,8 @@
#include "debugSaveEditor.h" #include "debugSaveEditor.h"
#include "../../util.h" #include "soh/util.h"
#include "../../ImGuiUtils.h" #include "soh/SohGui/ImGuiUtils.h"
#include "../../OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <spdlog/fmt/fmt.h> #include <spdlog/fmt/fmt.h>
#include <array> #include <array>

6
soh/soh/Enhancements/debugger/dlViewer.cpp
View File

@ -1,9 +1,9 @@
#include "actorViewer.h" #include "actorViewer.h"
#include "../../util.h" #include "soh/util.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "ResourceManager.h" #include "ResourceManager.h"
#include "DisplayList.h" #include "DisplayList.h"
#include "../../OTRGlobals.h" #include "soh/OTRGlobals.h"
#include <array> #include <array>
#include <bit> #include <bit>

4
soh/soh/Enhancements/debugger/hookDebugger.cpp
View File

@ -1,6 +1,6 @@
#include "hookDebugger.h" #include "hookDebugger.h"
#include "../game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <string> #include <string>
#include <version> #include <version>

2
soh/soh/Enhancements/debugger/valueViewer.cpp
View File

@ -1,5 +1,5 @@
#include "valueViewer.h" #include "valueViewer.h"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
extern "C" { extern "C" {

2
soh/soh/Enhancements/gameplaystats.cpp
View File

@ -5,7 +5,7 @@
#include "functions.h" #include "functions.h"
#include "macros.h" #include "macros.h"
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#include "../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "soh/util.h" #include "soh/util.h"
#include <vector> #include <vector>

2
soh/soh/Enhancements/presets.cpp
View File

@ -3,7 +3,7 @@
#include <string> #include <string>
#include <cstdint> #include <cstdint>
#include <libultraship/bridge.h> #include <libultraship/bridge.h>
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
void clearCvars(std::vector<const char*> cvarsToClear) { void clearCvars(std::vector<const char*> cvarsToClear) {

2
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View File

@ -159,7 +159,7 @@ static void WriteExcludedLocations() {
for (size_t i = 1; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size(); i++) { for (size_t i = 1; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size(); i++) {
for (const auto& location : Rando::Settings::GetInstance()->GetExcludeLocationsOptions()[i]) { for (const auto& location : Rando::Settings::GetInstance()->GetExcludeLocationsOptions()[i]) {
if (ctx->GetOption(location->GetKey()).Get() == RO_LOCATION_INCLUDE) { if (ctx->GetLocationOption(static_cast<RandomizerCheck>(location->GetKey())).Get() == RO_LOCATION_INCLUDE) {
continue; continue;
} }

4
soh/soh/Enhancements/randomizer/Plandomizer.cpp
View File

@ -1,5 +1,5 @@
#include "Plandomizer.h" #include "Plandomizer.h"
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "soh/util.h" #include "soh/util.h"
#include <vector> #include <vector>
#include "soh/Notification/Notification.h" #include "soh/Notification/Notification.h"
@ -10,7 +10,7 @@
#include <filesystem> #include <filesystem>
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/ImGuiUtils.h" #include "soh/SohGui/ImGuiUtils.h"
#include "soh/Enhancements/randomizer/logic.h" #include "soh/Enhancements/randomizer/logic.h"
#include "soh/Enhancements/randomizer/randomizer_check_objects.h" #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
#include "soh/Enhancements/randomizer/rando_hash.h" #include "soh/Enhancements/randomizer/rando_hash.h"

8
soh/soh/Enhancements/randomizer/context.cpp
View File

@ -438,14 +438,6 @@ OptionValue& Context::GetOption(const RandomizerSettingKey key) {
return mOptions[key]; return mOptions[key];
} }
OptionValue& Context::GetOption(const RandomizerTrick key) {
return mTrickOptions[key];
}
OptionValue& Context::GetOption(const RandomizerCheck key) {
return itemLocationTable[key].GetExcludedOption();
}
OptionValue& Context::GetTrickOption(const RandomizerTrick key) { OptionValue& Context::GetTrickOption(const RandomizerTrick key) {
return mTrickOptions[key]; return mTrickOptions[key];
} }

2
soh/soh/Enhancements/randomizer/context.h
View File

@ -91,8 +91,6 @@ class Context {
TrialInfo* GetTrial(TrialKey key) const; TrialInfo* GetTrial(TrialKey key) const;
static Sprite* GetSeedTexture(uint8_t index); static Sprite* GetSeedTexture(uint8_t index);
OptionValue& GetOption(RandomizerSettingKey key); OptionValue& GetOption(RandomizerSettingKey key);
OptionValue& GetOption(RandomizerTrick key);
OptionValue& GetOption(RandomizerCheck key);
OptionValue& GetTrickOption(RandomizerTrick key); OptionValue& GetTrickOption(RandomizerTrick key);
OptionValue& GetLocationOption(RandomizerCheck key); OptionValue& GetLocationOption(RandomizerCheck key);

2
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@ -12,7 +12,7 @@
#include "soh/Enhancements/randomizer/ShuffleFreestanding.h" #include "soh/Enhancements/randomizer/ShuffleFreestanding.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/ImGuiUtils.h" #include "soh/SohGui/ImGuiUtils.h"
#include "soh/Notification/Notification.h" #include "soh/Notification/Notification.h"
#include "soh/SaveManager.h" #include "soh/SaveManager.h"
#include "soh/Enhancements/randomizer/ShuffleFairies.h" #include "soh/Enhancements/randomizer/ShuffleFairies.h"

2
soh/soh/Enhancements/randomizer/option.cpp
View File

@ -2,7 +2,7 @@
#include "libultraship/bridge.h" #include "libultraship/bridge.h"
#include <Context.h> #include <Context.h>
#include <imgui.h> #include <imgui.h>
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
namespace Rando { namespace Rando {
Option Option::Bool(RandomizerSettingKey key_, std::string name_, std::vector<std::string> options_, Option Option::Bool(RandomizerSettingKey key_, std::string name_, std::vector<std::string> options_,

2
soh/soh/Enhancements/randomizer/option.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <cstdint> #include <cstdint>
#include <set> #include <set>

4
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -11,9 +11,9 @@
#include "3drando/rando_main.hpp" #include "3drando/rando_main.hpp"
#include "3drando/random.hpp" #include "3drando/random.hpp"
#include "soh/ResourceManagerHelpers.h" #include "soh/ResourceManagerHelpers.h"
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "3drando/custom_messages.hpp" #include "3drando/custom_messages.hpp"
#include "../../UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <imgui.h> #include <imgui.h>
#include <imgui_internal.h> #include <imgui_internal.h>
#include "../custom-message/CustomMessageTypes.h" #include "../custom-message/CustomMessageTypes.h"

2
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@ -6,7 +6,7 @@
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#include "soh/SaveManager.h" #include "soh/SaveManager.h"
#include "soh/ResourceManagerHelpers.h" #include "soh/ResourceManagerHelpers.h"
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "dungeon.h" #include "dungeon.h"
#include "location_access.h" #include "location_access.h"

2
soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
View File

@ -1,7 +1,7 @@
#include "randomizer_entrance_tracker.h" #include "randomizer_entrance_tracker.h"
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include <map> #include <map>
#include <string> #include <string>

2
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@ -4,7 +4,7 @@
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#include "soh/SaveManager.h" #include "soh/SaveManager.h"
#include "soh/ResourceManagerHelpers.h" #include "soh/ResourceManagerHelpers.h"
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "randomizerTypes.h" #include "randomizerTypes.h"
#include <map> #include <map>

2
soh/soh/Enhancements/resolution-editor/ResolutionEditor.cpp
View File

@ -2,7 +2,7 @@
#include <imgui.h> #include <imgui.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include <soh/UIWidgets.hpp> #include "soh/SohGui/UIWidgets.hpp"
#include <graphic/Fast3D/gfx_pc.h> #include <graphic/Fast3D/gfx_pc.h>
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h" #include "soh/cvar_prefixes.h"

2
soh/soh/Enhancements/timesplits/TimeSplits.cpp
View File

@ -1,5 +1,5 @@
#include "TimeSplits.h" #include "TimeSplits.h"
#include "soh/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp"
#include "soh/Enhancements/gameplaystats.h" #include "soh/Enhancements/gameplaystats.h"
#include "soh/SaveManager.h" #include "soh/SaveManager.h"
#include "soh/util.h" #include "soh/util.h"

4
soh/soh/OTRGlobals.cpp
View File

@ -42,7 +42,6 @@
#include "Fonts.h" #include "Fonts.h"
#include <utils/StringHelper.h> #include <utils/StringHelper.h>
#include "Enhancements/custom-message/CustomMessageManager.h" #include "Enhancements/custom-message/CustomMessageManager.h"
#include "ImGuiUtils.h"
#include "Enhancements/presets.h" #include "Enhancements/presets.h"
#include "util.h" #include "util.h"
#include <boost_custom/container_hash/hash_32.hpp> #include <boost_custom/container_hash/hash_32.hpp>
@ -70,7 +69,8 @@
#include "Enhancements/custom-message/CustomMessageTypes.h" #include "Enhancements/custom-message/CustomMessageTypes.h"
#include <functions.h> #include <functions.h>
#include "Enhancements/item-tables/ItemTableManager.h" #include "Enhancements/item-tables/ItemTableManager.h"
#include "SohGui.hpp" #include "soh/SohGui/SohGui.hpp"
#include "soh/SohGui/ImGuiUtils.h"
#include "ActorDB.h" #include "ActorDB.h"
#include "SaveManager.h" #include "SaveManager.h"

2
soh/soh/SaveManager.cpp
View File

@ -15,7 +15,7 @@
#include "macros.h" #include "macros.h"
#include <variables.h> #include <variables.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "SohGui.hpp" #include "soh/SohGui/SohGui.hpp"
#define NOGDI // avoid various windows defines that conflict with things in z64.h #define NOGDI // avoid various windows defines that conflict with things in z64.h
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>

50
soh/soh/SohGui.hpp
View File

@ -1,50 +0,0 @@
//
// SohGui.hpp
// soh
//
// Created by David Chavez on 24.08.22.
//
#ifndef SohGui_hpp
#define SohGui_hpp
#include <stdio.h>
#include "SohMenuBar.h"
#include "Enhancements/audio/AudioEditor.h"
#include "Enhancements/controls/InputViewer.h"
#include "Enhancements/cosmetics/CosmeticsEditor.h"
#include "Enhancements/debugger/actorViewer.h"
#include "Enhancements/debugger/colViewer.h"
#include "Enhancements/debugger/debugSaveEditor.h"
#include "Enhancements/debugger/hookDebugger.h"
#include "Enhancements/debugger/dlViewer.h"
#include "Enhancements/debugger/valueViewer.h"
#include "Enhancements/gameplaystatswindow.h"
#include "Enhancements/randomizer/randomizer_check_tracker.h"
#include "Enhancements/randomizer/randomizer_entrance_tracker.h"
#include "Enhancements/randomizer/randomizer_item_tracker.h"
#include "Enhancements/randomizer/randomizer_settings_window.h"
#include "Enhancements/timesplits/TimeSplits.h"
#include "Enhancements/randomizer/Plandomizer.h"
#include "AboutWindow.h"
#include "SohModals.h"
#ifdef __cplusplus
extern "C" {
#endif
void enableBetaQuest();
void disableBetaQuest();
#ifdef __cplusplus
}
#endif
namespace SohGui {
void SetupHooks();
void SetupGuiElements();
void Draw();
void Destroy();
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
void ShowRandomizerSettingsMenu();
}
#endif /* SohGui_hpp */

0
soh/soh/ImGuiUtils.cpp → soh/soh/SohGui/ImGuiUtils.cpp
View File

2
soh/soh/ImGuiUtils.h → soh/soh/SohGui/ImGuiUtils.h
View File

@ -7,7 +7,7 @@
#include <array> #include <array>
#include <map> #include <map>
#include <string> #include <string>
#include "Enhancements/randomizer/randomizerTypes.h" #include "soh/Enhancements/randomizer/randomizerTypes.h"
#include "variables.h" //only for gItemIcons #include "variables.h" //only for gItemIcons
extern "C" { extern "C" {

10
soh/soh/SohGui.cpp → soh/soh/SohGui/SohGui.cpp
View File

@ -25,15 +25,15 @@
#include "include/global.h" #include "include/global.h"
#include "include/z64audio.h" #include "include/z64audio.h"
#include "soh/SaveManager.h" #include "soh/SaveManager.h"
#include "OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/Enhancements/presets.h" #include "soh/Enhancements/presets.h"
#include "soh/resource/type/Skeleton.h" #include "soh/resource/type/Skeleton.h"
#include "libultraship/libultraship.h" #include "libultraship/libultraship.h"
#include "Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "Enhancements/cosmetics/authenticGfxPatches.h" #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
#include "Enhancements/resolution-editor/ResolutionEditor.h" #include "soh/Enhancements/resolution-editor/ResolutionEditor.h"
#include "Enhancements/debugger/MessageViewer.h" #include "soh/Enhancements/debugger/MessageViewer.h"
#include "soh/Notification/Notification.h" #include "soh/Notification/Notification.h"
#include "soh/Enhancements/TimeDisplay/TimeDisplay.h" #include "soh/Enhancements/TimeDisplay/TimeDisplay.h"

50
soh/soh/SohGui/SohGui.hpp Normal file
View File

@ -0,0 +1,50 @@
//
// SohGui.hpp
// soh
//
// Created by David Chavez on 24.08.22.
//
#ifndef SohGui_hpp
#define SohGui_hpp
#include <stdio.h>
#include "SohMenuBar.h"
#include "soh/Enhancements/audio/AudioEditor.h"
#include "soh/Enhancements/controls/InputViewer.h"
#include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
#include "soh/Enhancements/debugger/actorViewer.h"
#include "soh/Enhancements/debugger/colViewer.h"
#include "soh/Enhancements/debugger/debugSaveEditor.h"
#include "soh/Enhancements/debugger/hookDebugger.h"
#include "soh/Enhancements/debugger/dlViewer.h"
#include "soh/Enhancements/debugger/valueViewer.h"
#include "soh/Enhancements/gameplaystatswindow.h"
#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
#include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h"
#include "soh/Enhancements/randomizer/randomizer_item_tracker.h"
#include "soh/Enhancements/randomizer/randomizer_settings_window.h"
#include "soh/Enhancements/timesplits/TimeSplits.h"
#include "soh/Enhancements/randomizer/Plandomizer.h"
#include "soh/AboutWindow.h"
#include "SohModals.h"
#ifdef __cplusplus
extern "C" {
#endif
void enableBetaQuest();
void disableBetaQuest();
#ifdef __cplusplus
}
#endif
namespace SohGui {
void SetupHooks();
void SetupGuiElements();
void Draw();
void Destroy();
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
void ShowRandomizerSettingsMenu();
}
#endif /* SohGui_hpp */

52
soh/soh/SohMenuBar.cpp → soh/soh/SohGui/SohMenuBar.cpp
View File

@ -6,45 +6,45 @@
#include "UIWidgets.hpp" #include "UIWidgets.hpp"
#include "include/z64audio.h" #include "include/z64audio.h"
#include "graphic/Fast3D/gfx_rendering_api.h" #include "graphic/Fast3D/gfx_rendering_api.h"
#include "OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "SaveManager.h" #include "soh/SaveManager.h"
#include "z64.h" #include "z64.h"
#include "cvar_prefixes.h" #include "soh/cvar_prefixes.h"
#include "macros.h" #include "macros.h"
#include "functions.h" #include "functions.h"
#include "variables.h" #include "variables.h"
#include "Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/presets.h" #include "soh/Enhancements/presets.h"
#include "soh/Enhancements/mods.h" #include "soh/Enhancements/mods.h"
#include "soh/Notification/Notification.h" #include "soh/Notification/Notification.h"
#include "Enhancements/cosmetics/authenticGfxPatches.h" #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
#ifdef ENABLE_REMOTE_CONTROL #ifdef ENABLE_REMOTE_CONTROL
#include "soh/Network/CrowdControl/CrowdControl.h" #include "soh/Network/CrowdControl/CrowdControl.h"
#include "soh/Network/Sail/Sail.h" #include "soh/Network/Sail/Sail.h"
#endif #endif
#include "Enhancements/audio/AudioEditor.h" #include "soh/Enhancements/audio/AudioEditor.h"
#include "Enhancements/controls/InputViewer.h" #include "soh/Enhancements/controls/InputViewer.h"
#include "Enhancements/cosmetics/CosmeticsEditor.h" #include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
#include "Enhancements/debugger/actorViewer.h" #include "soh/Enhancements/debugger/actorViewer.h"
#include "Enhancements/debugger/colViewer.h" #include "soh/Enhancements/debugger/colViewer.h"
#include "Enhancements/debugger/debugSaveEditor.h" #include "soh/Enhancements/debugger/debugSaveEditor.h"
#include "Enhancements/debugger/hookDebugger.h" #include "soh/Enhancements/debugger/hookDebugger.h"
#include "Enhancements/debugger/dlViewer.h" #include "soh/Enhancements/debugger/dlViewer.h"
#include "Enhancements/debugger/valueViewer.h" #include "soh/Enhancements/debugger/valueViewer.h"
#include "Enhancements/gameplaystatswindow.h" #include "soh/Enhancements/gameplaystatswindow.h"
#include "Enhancements/debugger/MessageViewer.h" #include "soh/Enhancements/debugger/MessageViewer.h"
#include "Enhancements/randomizer/randomizer_check_tracker.h" #include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
#include "Enhancements/randomizer/randomizer_entrance_tracker.h" #include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h"
#include "Enhancements/randomizer/randomizer_item_tracker.h" #include "soh/Enhancements/randomizer/randomizer_item_tracker.h"
#include "Enhancements/randomizer/randomizer_settings_window.h" #include "soh/Enhancements/randomizer/randomizer_settings_window.h"
#include "Enhancements/resolution-editor/ResolutionEditor.h" #include "soh/Enhancements/resolution-editor/ResolutionEditor.h"
#include "Enhancements/enemyrandomizer.h" #include "soh/Enhancements/enemyrandomizer.h"
#include "Enhancements/timesplits/TimeSplits.h" #include "soh/Enhancements/timesplits/TimeSplits.h"
#include "Enhancements/randomizer/Plandomizer.h" #include "soh/Enhancements/randomizer/Plandomizer.h"
#include "Enhancements/TimeDisplay/TimeDisplay.h" #include "soh/Enhancements/TimeDisplay/TimeDisplay.h"
#include "AboutWindow.h" #include "soh/AboutWindow.h"
// FA icons are kind of wonky, if they worked how I expected them to the "+ 2.0f" wouldn't be needed, but // FA icons are kind of wonky, if they worked how I expected them to the "+ 2.0f" wouldn't be needed, but
// they don't work how I expect them to so I added that because it looked good when I eyeballed it // they don't work how I expect them to so I added that because it looked good when I eyeballed it

0
soh/soh/SohMenuBar.h → soh/soh/SohGui/SohMenuBar.h
View File

2
soh/soh/SohModals.cpp → soh/soh/SohGui/SohModals.cpp
View File

@ -5,7 +5,7 @@
#include <libultraship/bridge.h> #include <libultraship/bridge.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "UIWidgets.hpp" #include "UIWidgets.hpp"
#include "OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "z64.h" #include "z64.h"
extern "C" PlayState* gPlayState; extern "C" PlayState* gPlayState;

0
soh/soh/SohModals.h → soh/soh/SohGui/SohModals.h
View File

0
soh/soh/UIWidgets.cpp → soh/soh/SohGui/UIWidgets.cpp
View File

0
soh/soh/UIWidgets.hpp → soh/soh/SohGui/UIWidgets.hpp
View File