From 0fa178ee4012b32e400ef119ae86a1780e89d9b0 Mon Sep 17 00:00:00 2001
From: Jerom Venneker <jerom.venneker@gmail.com>
Date: Thu, 22 May 2025 22:58:28 +0200
Subject: [PATCH] made openssl use dynamic libraries on fedora

---
 soh/CMakeLists.txt                            | 9 ++++++++-
 soh/soh/Enhancements/randomizer/context.cpp   | 2 +-
 soh/soh/Enhancements/randomizer/static_data.h | 4 ----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index b9675ef29..9e2e9ece6 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -303,7 +303,14 @@ if (BUILD_REMOTE_CONTROL)
         set(SDL2-NET-INCLUDE ${SDL_NET_INCLUDE_DIRS})
     endif()
 
-    set(OPENSSL_USE_STATIC_LIBS TRUE)
+    file(STRINGS /etc/os-release distro REGEX "^NAME=")
+    string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" distro "${distro}")
+
+    if(${distro} MATCHES "Fedora Linux")
+        set(OPENSSL_USE_STATIC_LIBS OFF)
+    else()
+        set(OPENSSL_USE_STATIC_LIBS ON)
+    endif()
     find_package(OpenSSL)
     if(NOT OPENSSL_FOUND)
         message(STATUS "OpenSSL not found (it's possible the version installed is too old). Disabling BUILD_REMOTE_CONTROL.")
diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp
index 3a2408a49..e0222ee6b 100644
--- a/soh/soh/Enhancements/randomizer/context.cpp
+++ b/soh/soh/Enhancements/randomizer/context.cpp
@@ -487,7 +487,7 @@ void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient
     const std::string SlotName = ArchipelagoClient::GetInstance().GetSlotName();
     
     // init the item table with regular items first
-    for(int rc = 1; rc <= RC_MAX; rc++) {
+    for(int rc = 1; rc < RC_MAX; rc++) {
         // This may not even be needed
         const RandomizerGet vanillaItem = StaticData::GetLocation(static_cast<RandomizerCheck>(rc))->GetVanillaItem();
         itemLocationTable[rc].SetPlacedItem(vanillaItem);
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
index a5395253b..797fcab46 100644
--- a/soh/soh/Enhancements/randomizer/static_data.h
+++ b/soh/soh/Enhancements/randomizer/static_data.h
@@ -78,10 +78,6 @@ class StaticData {
     static std::unordered_map<u32, RandomizerHint> grottoChestParamsToHint;
     static std::array<HintText, RHT_MAX> hintTextTable;
 
-    static std::unordered_map<std::string_view, RandomizerGet> APitemToSoh;
-    static std::unordered_map<std::string_view, RandomizerCheck> APcheckToSoh;
-    static std::unordered_map<RandomizerCheck, std::string_view> SohCheckToAP;
-    static std::unordered_map<std::string_view, std::string_view> APsettingToHoSsetting;
     StaticData();
     ~StaticData();
 };