From 761f85037b0d0976d89c423b6a075e89ddabff59 Mon Sep 17 00:00:00 2001 From: aMannus Date: Mon, 28 Jul 2025 23:01:56 +0200 Subject: [PATCH] Fix memory bug --- soh/include/z64save.h | 2 +- soh/soh/Network/Archipelago/Archipelago.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 15e068fb4..1ddf34750 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -183,7 +183,7 @@ typedef struct ShipArchipelagoSaveContextData { ArchipelagoLocationData locations[RC_MAX]; } ShipArchipelagoSaveContextData; -typedef union ShipQuestSpecificSaveContextData { +typedef struct ShipQuestSpecificSaveContextData { ShipRandomizerSaveContextData randomizer; ShipBossRushSaveContextData bossRush; ShipArchipelagoSaveContextData archipelago; diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index 067973f4f..50f7cc6c6 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -645,7 +645,7 @@ void InitArchipelagoData(bool isDebug) { ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.slotName)); SohUtils::CopyStringToCharArray(gSaveContext.ship.quest.data.archipelago.archiUri, "", ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.archiUri)); - SohUtils::CopyStringToCharArray(gSaveContext.ship.quest.data.archipelago.roomHash, "", + SohUtils::CopyStringToCharArray(gSaveContext.ship.quest.data.archipelago.roomPass, "", ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.roomPass)); for (uint32_t i = 0; i < ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.locations); i++) {