Merge branch 'develop-zhora' into z-to-rando-next

soh/src/code/audio_playback.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "Cvar.h"
+#include <libultraship/Cvar.h>
 
 extern bool gUseLegacySD;
 

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

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;

soh/src/code/main.c

@@ -3,7 +3,7 @@
 #include <soh/Enhancements/bootcommands.h>
 #include "soh/OTRGlobals.h"
 
-#include "../libultraship/CrashHandler.h"
+#include <libultraship/CrashHandler.h>
 
 
 s32 gScreenWidth = SCREEN_WIDTH;
@@ -42,6 +42,8 @@ int main(int argc, char** argv)
 {
 #ifdef __linux__
     SetupHandlerLinux();
+#elif _WIN32
+    SetUnhandledExceptionFilter(seh_filter);
 #endif
     
     GameConsole_Init();

soh/src/code/z_en_item00.c

@@ -515,13 +515,13 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
     }
 
     if (!Actor_HasParent(&this->actor, globalCtx)) {
-        if (!gSaveContext.n64ddFlag) {
-            if (getItemId != GI_NONE) {
+        if (getItemId != GI_NONE) {
+            if (!gSaveContext.n64ddFlag) {
                 func_8002F554(&this->actor, globalCtx, getItemId);
+            } else {
+                getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
+                GiveItemEntryFromActorWithFixedRange(&this->actor, globalCtx, getItem);
             }
-        } else {
-            getItem = Randomizer_GetItemFromActor(this->actor.id, globalCtx->sceneNum, this->ogParams, getItemId);
-            GiveItemEntryFromActorWithFixedRange(&this->actor, globalCtx, getItem);
         }
     }
 

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>