Melon file select fixes

libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp

@@ -30,7 +30,7 @@
 
 #define GFX_API_NAME "SDL2 - OpenGL"
 
-static SDL_Window *wnd;
+static SDL_Window* wnd;
 static SDL_GLContext ctx;
 static int inverted_scancode_table[512];
 static int vsync_enabled = 0;
@@ -105,7 +105,8 @@ static void set_fullscreen(bool on, bool call_callback) {
         window_width = mode.w;
         window_height = mode.h;
         SDL_ShowCursor(false);
-    } else {
+    }
+    else {
         window_width = DESIRED_SCREEN_WIDTH;
         window_height = DESIRED_SCREEN_HEIGHT;
     }
@@ -128,9 +129,11 @@ static int target_fps = 60;
 #define FRAME_INTERVAL_US_NUMERATOR 1000000
 #define FRAME_INTERVAL_US_DENOMINATOR (target_fps)
 
-static void gfx_sdl_init(const char *game_name, bool start_in_fullscreen) {
+static void gfx_sdl_init(const char* game_name, bool start_in_fullscreen) {
     SDL_Init(SDL_INIT_VIDEO);
 
+    SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
+
     SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
@@ -145,7 +148,7 @@ static void gfx_sdl_init(const char *game_name, bool start_in_fullscreen) {
     int len = sprintf(title, "%s (%s)", game_name, GFX_API_NAME);
 
     wnd = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-            window_width, window_height, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+        window_width, window_height, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
 
     if (start_in_fullscreen) {
         set_fullscreen(true, false);
@@ -199,15 +202,16 @@ static void gfx_sdl_main_loop(void (*run_one_game_iter)(void)) {
     }
 }
 
-static void gfx_sdl_get_dimensions(uint32_t *width, uint32_t *height) {
+static void gfx_sdl_get_dimensions(uint32_t* width, uint32_t* height) {
     *width = window_width;
     *height = window_height;
 }
 
 static int translate_scancode(int scancode) {
     if (scancode < 512) {
         return inverted_scancode_table[scancode];
-    } else {
+    }
+    else {
         return 0;
     }
 }
@@ -226,30 +230,38 @@ static void gfx_sdl_onkeyup(int scancode) {
     }
 }
 
+extern "C" void LoadItemLocations(const char* spoilerFileName);
+
 static void gfx_sdl_handle_events(void) {
     SDL_Event event;
+    char* dropped_filedir;
     while (SDL_PollEvent(&event)) {
         SohImGui::EventImpl event_impl;
         event_impl.sdl = { &event };
         SohImGui::Update(event_impl);
         switch (event.type) {
 #ifndef TARGET_WEB
             // Scancodes are broken in Emscripten SDL2: https://bugzilla.libsdl.org/show_bug.cgi?id=3259
-            case SDL_KEYDOWN:
-                gfx_sdl_onkeydown(event.key.keysym.scancode);
-                break;
-            case SDL_KEYUP:
-                gfx_sdl_onkeyup(event.key.keysym.scancode);
-                break;
+        case SDL_KEYDOWN:
+            gfx_sdl_onkeydown(event.key.keysym.scancode);
+            break;
+        case SDL_KEYUP:
+            gfx_sdl_onkeyup(event.key.keysym.scancode);
+            break;
 #endif
-            case SDL_WINDOWEVENT:
-                if (event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
-                    window_width = event.window.data1;
-                    window_height = event.window.data2;
-                }
-                break;
-            case SDL_QUIT:
-                exit(0);
+        case SDL_WINDOWEVENT:
+            if (event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+                window_width = event.window.data1;
+                window_height = event.window.data2;
+            }
+            break;
+        case SDL_DROPFILE:
+        {
+            LoadItemLocations(event.drop.file);
+            break;
+        }
+        case SDL_QUIT:
+            exit(0);
         }
     }
 }
@@ -335,4 +347,4 @@ struct GfxWindowManagerAPI gfx_sdl = {
     gfx_sdl_get_detected_hz
 };
 
-#endif
+#endif

libultraship/libultraship/SohImGuiImpl.cpp

@@ -976,6 +976,12 @@ namespace SohImGui {
                 ImGui::EndMenu();
             }
 
+            if (ImGui::BeginMenu("Randomizer"))
+            {
+                EnhancementCheckbox("Enable Randomizer", "gRandomizer");
+                ImGui::EndMenu();
+            }
+
             if (ImGui::BeginMenu("Developer Tools"))
             {
                 EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");

libultraship/libultraship/SohImGuiImpl.h

@@ -87,4 +87,5 @@ namespace SohImGui {
     void ResetColor(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha);
     ImTextureID GetTextureByID(int id);
     ImTextureID GetTextureByName(const std::string& name);
+    // void LoadItemLocations(const char* spoilerFileName);
 }