ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix BGS issue & send room update if enabling AP (#6010)

Browse source
This commit is contained in:
Garrett Cox 2025-12-07 15:47:34 -06:00 committed by GitHub
parent be7cd12dda
commit 7b7c2e064e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/custom-message/CustomMessageTypes.h
View file

@ -14,7 +14,6 @@ typedef enum {
TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH = 0x0027, TEXT_SKULLTULA_PEOPLE_MAKE_YOU_VERY_RICH = 0x0027,
TEXT_SKULLTULA_PEOPLE_CURSE_HAS_BEEN_BROKEN = 0x0028, TEXT_SKULLTULA_PEOPLE_CURSE_HAS_BEEN_BROKEN = 0x0028,
TEXT_SKULLTULA_PEOPLE_SAVING_MY_KIDS = 0x0029, TEXT_SKULLTULA_PEOPLE_SAVING_MY_KIDS = 0x0029,
TEXT_CUSTOM_MESSAGE = 0x004B, // Unused
TEXT_ITEM_KEY_SMALL = 0x0060, TEXT_ITEM_KEY_SMALL = 0x0060,
TEXT_ITEM_DUNGEON_MAP = 0x0066, TEXT_ITEM_DUNGEON_MAP = 0x0066,
TEXT_CHEST_GAME_REAL_GAMBLER = 0x006E, TEXT_CHEST_GAME_REAL_GAMBLER = 0x006E,
@ -32,6 +31,7 @@ typedef enum {
TEXT_PURPLE_RUPEE = 0x00F1, TEXT_PURPLE_RUPEE = 0x00F1,
TEXT_HUGE_RUPEE = 0x00F2, TEXT_HUGE_RUPEE = 0x00F2,
TEXT_RANDOMIZER_CUSTOM_ITEM = 0x00F8, TEXT_RANDOMIZER_CUSTOM_ITEM = 0x00F8,
TEXT_CUSTOM_MESSAGE = 0x0109,
TEXT_NAVI_DEKU_TREE_SUMMONS = 0x0140, TEXT_NAVI_DEKU_TREE_SUMMONS = 0x0140,
TEXT_NAVI_CMON_BE_BRAVE = 0x0141, TEXT_NAVI_CMON_BE_BRAVE = 0x0141,
TEXT_NAVI_VISIT_THE_PRINCESS = 0x0142, TEXT_NAVI_VISIT_THE_PRINCESS = 0x0142,

4
soh/soh/Network/Archipelago/Archipelago.cpp
View file

@ -20,6 +20,7 @@
#include "soh/SaveManager.h" #include "soh/SaveManager.h"
#include "soh/SohGui/SohGui.hpp" #include "soh/SohGui/SohGui.hpp"
#include "soh/OTRGlobals.h" #include "soh/OTRGlobals.h"
#include "soh/Network/Anchor/Anchor.h"
extern "C" { extern "C" {
#include "variables.h" #include "variables.h"
@ -49,6 +50,9 @@ bool ArchipelagoClient::StartClient() {
} }
CVarSetInteger(CVAR_REMOTE_ANCHOR("RoomSettings.SyncItemsAndFlags"), 0); CVarSetInteger(CVAR_REMOTE_ANCHOR("RoomSettings.SyncItemsAndFlags"), 0);
if (Anchor::Instance->isConnected && Anchor::Instance->roomState.ownerClientId == Anchor::Instance->ownClientId) {
Anchor::Instance->SendPacket_UpdateRoomState();
}
disconnecting = false; disconnecting = false;
retries = 0; retries = 0;