nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Removed IS_ARCHIPELAGO defines

Browse Source
This commit is contained in:
Jerom Venneker
2025-05-23 18:22:50 +02:00
parent b2c2be034e
commit a9e99e400c
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/include/z64save.h
View File

@@ -339,7 +339,7 @@ typedef enum {
#define IS_MASTER_QUEST (gSaveContext.ship.quest.id == QUEST_MASTER) #define IS_MASTER_QUEST (gSaveContext.ship.quest.id == QUEST_MASTER)
#define IS_RANDO (gSaveContext.ship.quest.id == QUEST_RANDOMIZER) #define IS_RANDO (gSaveContext.ship.quest.id == QUEST_RANDOMIZER)
#define IS_BOSS_RUSH (gSaveContext.ship.quest.id == QUEST_BOSSRUSH) #define IS_BOSS_RUSH (gSaveContext.ship.quest.id == QUEST_BOSSRUSH)
#define IS_ARCHIPELAGO (gSaveContext.ship.quest.id == QUEST_ARCHIPELAGO) #define IS_ARCHIPELAGO (gSaveContext.ship.quest.data.archipelago.isArchipelago == 1)
typedef enum { typedef enum {
/* 0x00 */ BTN_ENABLED, /* 0x00 */ BTN_ENABLED,

1
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@@ -2527,7 +2527,6 @@ void RandomizerRegisterHooks() {
// TODO Implement propeerly when we can read what kind of game we're playing from the save file // TODO Implement propeerly when we can read what kind of game we're playing from the save file
#define IS_ARCHIPELAGO true
COND_HOOK(GameInteractor::OnArchipelagoItemRecieved, IS_ARCHIPELAGO, ArchipelagoOnRecieveItem); COND_HOOK(GameInteractor::OnArchipelagoItemRecieved, IS_ARCHIPELAGO, ArchipelagoOnRecieveItem);
if (RAND_GET_OPTION(RSK_FISHSANITY) != RO_FISHSANITY_OFF) { if (RAND_GET_OPTION(RSK_FISHSANITY) != RO_FISHSANITY_OFF) {

11
soh/soh/Network/Archipelago/Archipelago.cpp
View File

@@ -101,9 +101,12 @@ bool ArchipelagoClient::StartClient() {
} }
void ArchipelagoClient::GameLoaded() { void ArchipelagoClient::GameLoaded() {
// if its not an AP save, disconnect
if(!IS_ARCHIPELAGO) { if(!IS_ARCHIPELAGO) {
// apClient->reset(); if(apClient != nullptr) {
// return; apClient->reset();
}
return;
} }
SynchItems(); SynchItems();
@@ -345,10 +348,6 @@ void InitArchipelagoData(bool isDebug) {
} }
} }
// Implement this properly once we have some kind of indication within a save file wether the player is in a normal
// rando save or an archipelago one.
#define IS_ARCHIPELAGO true
void RegisterArchipelago() { void RegisterArchipelago() {
COND_HOOK(GameInteractor::OnRandomizerItemGivenHooks, IS_ARCHIPELAGO, COND_HOOK(GameInteractor::OnRandomizerItemGivenHooks, IS_ARCHIPELAGO,
[](uint32_t rc) { [](uint32_t rc) {