Merge pull request #11 from MelonSpeedruns/melon-file-select-fixes

added direct3d drag support

libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp

@@ -117,7 +117,8 @@ static void run_as_dpi_aware(Fun f) {
     DPI_AWARENESS_CONTEXT old_awareness_context = nullptr;
     if (SetThreadDpiAwarenessContext != nullptr) {
         old_awareness_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
-    } else {
+    }
+    else {
         // Solution for Windows 8.1 and newer, but before Windows 10 1607.
         // SetProcessDpiAwareness must be called before any drawing related API is called.
         if (!dxgi.process_dpi_awareness_done) {
@@ -162,13 +163,15 @@ static void toggle_borderless_window_full_screen(bool enable, bool call_callback
         if (dxgi.last_maximized_state) {
             SetWindowPos(dxgi.h_wnd, NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE);
             ShowWindow(dxgi.h_wnd, SW_MAXIMIZE);
-        } else {
+        }
+        else {
             SetWindowPos(dxgi.h_wnd, NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_FRAMECHANGED);
             ShowWindow(dxgi.h_wnd, SW_RESTORE);
         }
 
         dxgi.is_full_screen = false;
-    } else {
+    }
+    else {
         // Save if window is maximized or not
         WINDOWPLACEMENT window_placement;
         window_placement.length = sizeof(WINDOWPLACEMENT);
@@ -212,6 +215,8 @@ static void onkeyup(WPARAM w_param, LPARAM l_param) {
     }
 }
 
+extern "C" void LoadItemLocations(const char* spoilerFileName);
+
 static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_param, LPARAM l_param) {
     SohImGui::EventImpl event_impl;
     event_impl.win32 = { h_wnd, static_cast<int>(message), static_cast<int>(w_param), static_cast<int>(l_param) };
@@ -227,7 +232,8 @@ static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_par
         if (dxgi.in_paint) {
             dxgi.recursive_paint_detected = true;
             return DefWindowProcW(h_wnd, message, w_param, l_param);
-            } else {
+        }
+        else {
             if (dxgi.run_one_game_iter != nullptr) {
                 dxgi.in_paint = true;
                 dxgi.run_one_game_iter();
@@ -251,11 +257,17 @@ static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_par
     case WM_KEYUP:
         onkeyup(w_param, l_param);
         break;
+    case WM_DROPFILES:
+        char fileName[256];
+        DragQueryFileA((HDROP)w_param, 0, fileName, 256);
+        LoadItemLocations(fileName);
+        break;
     case WM_SYSKEYDOWN:
         if ((w_param == VK_RETURN) && ((l_param & 1 << 30) == 0)) {
             toggle_borderless_window_full_screen(!dxgi.is_full_screen, true);
             break;
-            } else {
+        }
+        else {
             return DefWindowProcW(h_wnd, message, w_param, l_param);
         }
     default:
@@ -319,6 +331,8 @@ void gfx_dxgi_init(const char *game_name, bool start_in_fullscreen) {
     if (start_in_fullscreen) {
         toggle_borderless_window_full_screen(true, false);
     }
+
+    DragAcceptFiles(dxgi.h_wnd, TRUE);
 }
 
 static void gfx_dxgi_set_fullscreen_changed_callback(void (*on_fullscreen_changed)(bool is_now_fullscreen)) {
@@ -455,7 +469,8 @@ static bool gfx_dxgi_start_frame(void) {
                     vsyncs_to_wait = 1;
                 }
                 dxgi.frame_timestamp = FRAME_INTERVAL_US_DENOMINATOR * (last_end_us + vsyncs_to_wait * estimated_vsync_interval_us);
-            } else {
+            }
+            else {
                 // Drop frame
                 //printf("Dropping frame\n");
                 dxgi.dropped_frame = true;
@@ -477,7 +492,8 @@ static bool gfx_dxgi_start_frame(void) {
             }
             if (diff_left < diff_right) {
                 vsyncs_to_wait = floor(vsyncs_to_wait);
-            } else {
+            }
+            else {
                 vsyncs_to_wait = ceil(vsyncs_to_wait);
             }
             if (vsyncs_to_wait == 0) {
@@ -493,7 +509,8 @@ static bool gfx_dxgi_start_frame(void) {
             dxgi.use_timer = true;
         }
         dxgi.length_in_vsync_frames = vsyncs_to_wait;
-    } else {
+    }
+    else {
         dxgi.length_in_vsync_frames = 1;
         dxgi.use_timer = true;
     }
@@ -561,7 +578,8 @@ static void gfx_dxgi_set_frame_divisor(int divisor) {
 void gfx_dxgi_create_factory_and_device(bool debug, int d3d_version, bool (*create_device_fn)(IDXGIAdapter1* adapter, bool test_only)) {
     if (dxgi.CreateDXGIFactory2 != nullptr) {
         ThrowIfFailed(dxgi.CreateDXGIFactory2(debug ? DXGI_CREATE_FACTORY_DEBUG : 0, __uuidof(IDXGIFactory2), &dxgi.factory));
-    } else {
+    }
+    else {
         ThrowIfFailed(dxgi.CreateDXGIFactory1(__uuidof(IDXGIFactory2), &dxgi.factory));
     }
 
@@ -622,7 +640,8 @@ ComPtr<IDXGISwapChain1> gfx_dxgi_create_swap_chain(IUnknown *device) {
         ThrowIfFailed(swap_chain2->SetMaximumFrameLatency(1));
         dxgi.waitable_object = swap_chain2->GetFrameLatencyWaitableObject();
         WaitForSingleObject(dxgi.waitable_object, INFINITE);
-    } else {
+    }
+    else {
         ComPtr<IDXGIDevice1> device1;
         ThrowIfFailed(device->QueryInterface(IID_PPV_ARGS(&device1)));
         ThrowIfFailed(device1->SetMaximumFrameLatency(1));

libultraship/libultraship/Lib/Fast3D/gfx_sdl2.cpp

@@ -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;
     }
@@ -210,7 +211,8 @@ static void gfx_sdl_get_dimensions(uint32_t *width, uint32_t *height) {
 static int translate_scancode(int scancode) {
     if (scancode < 512) {
         return inverted_scancode_table[scancode];
-    } else {
+    }
+    else {
         return 0;
     }
 }
@@ -256,9 +258,7 @@ static void gfx_sdl_handle_events(void) {
             break;
         case SDL_DROPFILE:
         {
-                #ifndef __linux__
             LoadItemLocations(event.drop.file);
-                #endif
             break;
         }
         case SDL_QUIT:

soh/include/z64save.h

@@ -179,7 +179,7 @@ typedef struct {
     /* 0x1420 */ s16 worldMapArea;
     /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
     /* 0x1424 */ s16 healthAccumulator;
-    ItemLocation itemLocations[512];
+    ItemLocation itemLocations[266];
     Sprite seedIcons[5];
 } SaveContext; // size = 0x1428
 

soh/soh/Enhancements/randomizer.cpp

@@ -713,12 +713,21 @@ s16 Randomizer::GetItemModelFromId(s16 itemId) {
 }
 
 void Randomizer::LoadItemLocations(const char* spoilerFileName) {
+    if (strcmp(spoilerFileName, "") != 0) {
         // bandaid until new save stuff happens
         ParseItemLocations(spoilerFileName);
 
         for (auto itemLocation : gSaveContext.itemLocations) {
             this->itemLocations[itemLocation.check] = itemLocation.get;
         }
+    } else {
+        u16 index = 0;
+        for (auto itemLocation : this->itemLocations) {
+            gSaveContext.itemLocations[index].check = itemLocation.first;
+            gSaveContext.itemLocations[index].get = itemLocation.second;
+            index++;
+        }
+    }
 }
 
 void Randomizer::ParseItemLocations(const char* spoilerFileName) {
@@ -1013,6 +1022,11 @@ RandomizerCheck Randomizer::GetCheckFromSceneAndParams(s16 sceneNum, s16 actorPa
     }
 
     switch(sceneNum) {
+        case 17:
+            switch (actorParams) {
+                case 0x1F:
+                    return DEKU_TREE_QUEEN_GOHMA_HEART;
+            }
         case 40:
             switch(actorParams) {
                 case 22944:
@@ -1026,7 +1040,7 @@ RandomizerCheck Randomizer::GetCheckFromSceneAndParams(s16 sceneNum, s16 actorPa
             }
         case 84:
             switch (actorParams) {
-                case 0x0406:
+                case 1030:
                     return ZR_NEAR_OPEN_GROTTO_FREESTANDING_POH;
                 case 2822:
                     return ZR_NEAR_DOMAIN_FREESTANDING_POH;

soh/src/code/title_setup.c

@@ -4,7 +4,7 @@ void TitleSetup_InitImpl(GameState* gameState) {
     osSyncPrintf("ゼルダ共通データ初期化\n"); // "Zelda common data initalization"
     SaveContext_Init();
     gameState->running = false;
-    SET_NEXT_GAMESTATE(gameState, FileChoose_Init, TitleContext);
+    SET_NEXT_GAMESTATE(gameState, Title_Init, TitleContext);
 }
 
 void TitleSetup_Destroy(GameState* gameState) {

soh/src/code/z_play.c

@@ -193,6 +193,62 @@ void Gameplay_Destroy(GameState* thisx) {
     gGlobalCtx = NULL;
 }
 
+void GiveLinksPocketMedallion(GlobalContext* globalCtx) {
+    if (gSaveContext.n64ddFlag) {
+        RandomizerGet get = gSaveContext.itemLocations[LINKS_POCKET].get;
+
+        s16 item;
+
+        u8 medallion = 0;
+
+        switch (get) {
+            case FOREST_MEDALLION:
+                item = ITEM_MEDALLION_FOREST;
+                medallion = 1;
+                break;
+            case FIRE_MEDALLION:
+                item = ITEM_MEDALLION_FIRE;
+                medallion = 1;
+                break;
+            case WATER_MEDALLION:
+                item = ITEM_MEDALLION_WATER;
+                medallion = 1;
+                break;
+            case SHADOW_MEDALLION:
+                item = ITEM_MEDALLION_SHADOW;
+                medallion = 1;
+                break;
+            case SPIRIT_MEDALLION:
+                item = ITEM_MEDALLION_SPIRIT;
+                medallion = 1;
+                break;
+            case LIGHT_MEDALLION:
+                item = ITEM_MEDALLION_LIGHT;
+                medallion = 1;
+                break;
+            case KOKIRI_EMERALD:
+                item = ITEM_KOKIRI_EMERALD;
+                break;
+            case GORON_RUBY:
+                item = ITEM_GORON_RUBY;
+                break;
+            case ZORA_SAPPHIRE:
+                item = ITEM_ZORA_SAPPHIRE;
+                break;
+        }
+
+        if (medallion == 1) {
+            gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST];
+
+            if (item == ITEM_MEDALLION_WATER) {
+                func_8006D0AC(globalCtx);
+            }
+        } else {
+            gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD];
+        }
+    }
+}
+
 void Gameplay_Init(GameState* thisx) {
     GlobalContext* globalCtx = (GlobalContext*)thisx;
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
@@ -207,6 +263,8 @@ void Gameplay_Init(GameState* thisx) {
     u8 tempSetupIndex;
     s32 pad[2];
 
+    GiveLinksPocketMedallion(globalCtx);
+
     if (gSaveContext.entranceIndex == -1) {
         gSaveContext.entranceIndex = 0;
         globalCtx->state.running = false;

soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c

@@ -515,8 +515,13 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, GlobalContext* globalCtx) {
                 Flags_SetEventChkInf(7);
                 Flags_SetEventChkInf(9);
                 Item_Give(globalCtx, ITEM_KOKIRI_EMERALD);
+                if (gSaveContext.n64ddFlag) {
+                    globalCtx->nextEntranceIndex = 0x0457;
+                    gSaveContext.nextCutsceneIndex = 0;
+                } else {
                     globalCtx->nextEntranceIndex = 0xEE;
                     gSaveContext.nextCutsceneIndex = 0xFFF1;
+                }
             } else {
                 globalCtx->nextEntranceIndex = 0x457;
                 gSaveContext.nextCutsceneIndex = 0;

soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c

@@ -58,10 +58,15 @@ void ItemBHeart_Update(Actor* thisx, GlobalContext* globalCtx) {
     if (Actor_HasParent(&this->actor, globalCtx)) {
         Flags_SetCollectible(globalCtx, 0x1F);
         Actor_Kill(&this->actor);
+    } else {
+        if (gSaveContext.n64ddFlag) {
+            s16 getItemId = GetRandomizedItemId(GI_HEART_CONTAINER_2, globalCtx->sceneNum, 0x1F);
+            func_8002F434(&this->actor, globalCtx, getItemId, 30.0f, 40.0f);
         } else {
             func_8002F434(&this->actor, globalCtx, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
         }
     }
+}
 
 void func_80B85264(ItemBHeart* this, GlobalContext* globalCtx) {
     f32 yOffset;
@@ -93,6 +98,10 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) {
         actorIt = actorIt->next;
     }
 
+    if (gSaveContext.n64ddFlag) {
+        GetItem_Draw(globalCtx,
+                     GetItemModelFromId(GetRandomizedItemId(GI_HEART_CONTAINER_2, globalCtx->sceneNum, 0x1F)));
+    } else {
         if (flag) {
             func_80093D84(globalCtx->state.gfxCtx);
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 551),
@@ -106,6 +115,7 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) {
             gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL);
             gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL);
         }
+    }
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 561);
 }

soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c

@@ -1519,7 +1519,6 @@ void FileChoose_LoadGame(GameState* thisx) {
         Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
         gSaveContext.fileNum = this->buttonIndex;
         Sram_OpenSave(&this->sramCtx);
-        // LoadItemLocations();
         gSaveContext.gameMode = 0;
         SET_NEXT_GAMESTATE(&this->state, Select_Init, SelectContext);
         this->state.running = false;
@@ -1527,12 +1526,14 @@ void FileChoose_LoadGame(GameState* thisx) {
         Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
         gSaveContext.fileNum = this->buttonIndex;
         Sram_OpenSave(&this->sramCtx);
-        // LoadItemLocations();
+
         gSaveContext.gameMode = 0;
         SET_NEXT_GAMESTATE(&this->state, Gameplay_Init, GlobalContext);
         this->state.running = false;
     }
 
+    LoadItemLocations("");
+
     gSaveContext.respawn[0].entranceIndex = -1;
     gSaveContext.respawnFlag = 0;
     gSaveContext.seqId = (u8)NA_BGM_DISABLED;