diff options
| author | David Chavez <david@dcvz.io> | 2022-09-03 06:00:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-03 00:00:04 -0400 |
| commit | 0ce0ab1260dd24ac6168d1cdd28d60f21554cd86 (patch) | |
| tree | f7eb69019cdb89deea52e24f6c2087860f7871b0 /soh/src/code | |
| parent | 64aca784507fdcebd81e216ea3489739550d6a1a (diff) | |
Phase 1: Separate ImGui Drawing From LUS (#1310)
* Update LUS imported paths
* Introduce GameMenuBar
* Fix imports after LUS import paths change
* Move Randomizer
* Replace needs_save
* Migrate Developer Tools
* Migrate Cheats
* Migrate Enhancements
* Separate UIWidgets
* Add missing Hooks.cpp file
* Migrate Settings
* Remove UI methods from LUS
* Cleanup imports and exposed properties
* Cleanup more methods
* Fix project generation
* Fix CI compilation
* Remove resolved TODO
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/audio_playback.c | 2 | ||||
| -rw-r--r-- | soh/src/code/audio_synthesis.c | 2 | ||||
| -rw-r--r-- | soh/src/code/code_800F9280.c | 4 | ||||
| -rw-r--r-- | soh/src/code/z_play.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c index b2017b514..2c7ff425d 100644 --- a/soh/src/code/audio_playback.c +++ b/soh/src/code/audio_playback.c @@ -1,5 +1,5 @@ #include "global.h" -#include "Cvar.h" +#include <libultraship/Cvar.h> extern bool gUseLegacySD; diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c index 67f7033ea..72dbb25ec 100644 --- a/soh/src/code/audio_synthesis.c +++ b/soh/src/code/audio_synthesis.c @@ -1,6 +1,6 @@ #include "ultra64.h" #include "global.h" -#include "mixer.h" +#include <libultraship/mixer.h> #define DEFAULT_LEN_1CH 0x1A0 #define DEFAULT_LEN_2CH 0x340 diff --git a/soh/src/code/code_800F9280.c b/soh/src/code/code_800F9280.c index 6ca2ad75d..5fa3d50fa 100644 --- a/soh/src/code/code_800F9280.c +++ b/soh/src/code/code_800F9280.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "global.h" -#include "ultra64/abi.h" -#include "mixer.h" +#include <ultra64/abi.h> +#include <libultraship/mixer.h> typedef struct { u8 unk_0; diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 6b311fd4c..f831bc830 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -4,7 +4,7 @@ #include <string.h> #include "soh/Enhancements/gameconsole.h" -#include "../libultraship/ImGuiImpl.h" +#include <libultraship/ImGuiImpl.h> #include "soh/frame_interpolation.h" #include <time.h> |