Address rando pr comments (#742)

* prefix randomizer methods with Randomizer_

* make filename a local var

* remove unused file, update malon to use new names

* move randomizertypes to randomizer directory

* rename to Randomizer_GetSettingValue

Co-authored-by: briaguya <briaguya@alice>

libultraship/libultraship/Lib/Fast3D/gfx_dxgi.cpp

@@ -229,9 +229,8 @@ static void onkeyup(WPARAM w_param, LPARAM l_param) {
     }
 }
 
-char fileName[256];
-
 static LRESULT CALLBACK gfx_dxgi_wnd_proc(HWND h_wnd, UINT message, WPARAM w_param, LPARAM l_param) {
+    char fileName[256];
     SohImGui::EventImpl event_impl;
     event_impl.win32 = { h_wnd, static_cast<int>(message), static_cast<int>(w_param), static_cast<int>(l_param) };
     SohImGui::Update(event_impl);

soh/include/z64save.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "z64math.h"
-#include <randomizerTypes.h>
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 
 typedef struct {
     /* 0x00 */ u8 buttonItems[8];

soh/soh.vcxproj

@@ -983,7 +983,7 @@
     <ClInclude Include="soh\Enhancements\randomizer\3drando\tinyxml2.h" />
     <ClInclude Include="soh\Enhancements\randomizer\3drando\trial.hpp" />
     <ClInclude Include="soh\Enhancements\randomizer\3drando\utils.hpp" />
-    <ClInclude Include="randomizerTypes.h" />
+    <ClInclude Include="soh\Enhancements\randomizer\randomizerTypes.h" />
     <ClInclude Include="soh\Enhancements\randomizer\randomizer_item_tracker.h" />
     <ClInclude Include="soh\frame_interpolation.h" />
     <ClInclude Include="include\alloca.h" />

soh/soh.vcxproj.filters

@@ -4052,7 +4052,7 @@
     <ClInclude Include="soh\Enhancements\randomizer\3drando\utils.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="randomizerTypes.h">
+    <ClInclude Include="soh\Enhancements\randomizer\randomizerTypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="soh\Enhancements\gfx.h">

soh/soh/Enhancements/randomizer/3drando/menu.cpp

@@ -14,7 +14,7 @@
 #include "location_access.hpp"
 #include "debug.hpp"
 #include <Lib/spdlog/include/spdlog/spdlog.h>
-#include "randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 
 namespace {
 bool seedChanged;

soh/soh/Enhancements/randomizer/3drando/menu.hpp

@@ -2,7 +2,7 @@
 
 #include <string>
 #include <unordered_map>
-#include "randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 
 #define MAIN_MENU 0
 #define OPTION_SUB_MENU 1

soh/soh/Enhancements/randomizer/3drando/playthrough.cpp

@@ -6,7 +6,7 @@
 #include "logic.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"
-#include "randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 
 namespace Playthrough {
 

soh/soh/Enhancements/randomizer/randomizer.h

@@ -4,7 +4,7 @@
 #include <string>
 #include "../../../include/ultra64.h"
 #include "../../../include/z64item.h"
-#include <randomizerTypes.h>
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
 
 class Randomizer {
   private:

soh/soh/OTRGlobals.cpp

@@ -1367,35 +1367,35 @@ extern "C" void* getN64WeirdFrame(s32 i) {
     return &weirdFrameBytes[i + sizeof(n64WeirdFrames)];
 }
 
-extern "C" s16 GetItemModelFromId(s16 itemId) {
+extern "C" s16 Randomizer_GetItemModelFromId(s16 itemId) {
     return OTRGlobals::Instance->gRandomizer->GetItemModelFromId(itemId);
 }
 
-extern "C" s32 GetItemIDFromGetItemID(s32 getItemId) {
+extern "C" s32 Randomizer_GetItemIDFromGetItemID(s32 getItemId) {
     return OTRGlobals::Instance->gRandomizer->GetItemIDFromGetItemID(getItemId);
 }
 
-extern "C" void LoadRandomizerSettings(const char* spoilerFileName) {
+extern "C" void Randomizer_LoadSettings(const char* spoilerFileName) {
     OTRGlobals::Instance->gRandomizer->LoadRandomizerSettings(spoilerFileName);
 }
 
-extern "C" void LoadHintLocations(const char* spoilerFileName) {
+extern "C" void Randomizer_LoadHintLocations(const char* spoilerFileName) {
     OTRGlobals::Instance->gRandomizer->LoadHintLocations(spoilerFileName);
 }
 
-extern "C" void LoadItemLocations(const char* spoilerFileName, bool silent) {
+extern "C" void Randomizer_LoadItemLocations(const char* spoilerFileName, bool silent) {
     OTRGlobals::Instance->gRandomizer->LoadItemLocations(spoilerFileName, silent);
 }
 
 extern "C" bool SpoilerFileExists(const char* spoilerFileName) {
     return OTRGlobals::Instance->gRandomizer->SpoilerFileExists(spoilerFileName);
 }
 
-extern "C" u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey) {
+extern "C" u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey) {
     return OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(randoSettingKey);
 }
 
-extern "C" RandomizerCheck GetCheckFromActor(s16 sceneNum, s16 actorId, s16 actorParams) {
+extern "C" RandomizerCheck Randomizer_GetCheckFromActor(s16 sceneNum, s16 actorId, s16 actorParams) {
     return OTRGlobals::Instance->gRandomizer->GetCheckFromActor(sceneNum, actorId, actorParams);
 }
 
@@ -1471,33 +1471,33 @@ extern "C" int CopyScrubMessage(u16 scrubTextId, char* buffer, const int maxBuff
     return CopyStringToCharBuffer(scrubText, buffer, maxBufferSize);
 }
 
-extern "C" int CopyAltarMessage(char* buffer, const int maxBufferSize) {
+extern "C" int Randomizer_CopyAltarMessage(char* buffer, const int maxBufferSize) {
     const std::string& altarText = (LINK_IS_ADULT) ? OTRGlobals::Instance->gRandomizer->GetAdultAltarText()
                                                    : OTRGlobals::Instance->gRandomizer->GetChildAltarText();
     return CopyStringToCharBuffer(altarText, buffer, maxBufferSize);
 }
 
-extern "C" int CopyGanonText(char* buffer, const int maxBufferSize) {
+extern "C" int Randomizer_CopyGanonText(char* buffer, const int maxBufferSize) {
     const std::string& ganonText = OTRGlobals::Instance->gRandomizer->GetGanonText();
     return CopyStringToCharBuffer(ganonText, buffer, maxBufferSize);
 }
 
-extern "C" int CopyGanonHintText(char* buffer, const int maxBufferSize) {
+extern "C" int Randomizer_CopyGanonHintText(char* buffer, const int maxBufferSize) {
     const std::string& ganonText = OTRGlobals::Instance->gRandomizer->GetGanonHintText();
     return CopyStringToCharBuffer(ganonText, buffer, maxBufferSize);
 }
 
-extern "C" int CopyHintFromCheck(RandomizerCheck check, char* buffer, const int maxBufferSize) {
+extern "C" int Randomizer_CopyHintFromCheck(RandomizerCheck check, char* buffer, const int maxBufferSize) {
     // we don't want to make a copy of the std::string returned from GetHintFromCheck 
     // so we're just going to let RVO take care of it
     const std::string& hintText = OTRGlobals::Instance->gRandomizer->GetHintFromCheck(check);
     return CopyStringToCharBuffer(hintText, buffer, maxBufferSize);
 }
 
-extern "C" s32 GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum) {
+extern "C" s32 Randomizer_GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum) {
     return OTRGlobals::Instance->gRandomizer->GetRandomizedItemId(ogId, actorId, actorParams, sceneNum);
 }
 
-extern "C" s32 GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId) {
+extern "C" s32 Randomizer_GetItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId) {
     return OTRGlobals::Instance->gRandomizer->GetRandomizedItemIdFromKnownCheck(randomizerCheck, ogId);
 }

soh/soh/OTRGlobals.h

@@ -84,19 +84,19 @@ void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
 int Controller_ShouldRumble(size_t i);
 void* getN64WeirdFrame(s32 i);
 Sprite* GetSeedTexture(uint8_t index);
-void LoadRandomizerSettings(const char* spoilerFileName);
-u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
-RandomizerCheck GetCheckFromActor(s16 actorId, s16 actorParams, s16 sceneNum);
-int CopyAltarMessage(char* buffer, const int maxBufferSize);
-int CopyHintFromCheck(RandomizerCheck check, char* buffer, const int maxBufferSize);
-int CopyGanonText(char* buffer, const int maxBufferSize);
-int CopyGanonHintText(char* buffer, const int maxBufferSize);
-void LoadHintLocations(const char* spoilerFileName);
-void LoadItemLocations(const char* spoilerFileName, bool silent);
-s16 GetItemModelFromId(s16 itemId);
-s32 GetItemIDFromGetItemID(s32 getItemId);
-s32 GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum);
-s32 GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
+void Randomizer_LoadSettings(const char* spoilerFileName);
+u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
+RandomizerCheck Randomizer_GetCheckFromActor(s16 actorId, s16 actorParams, s16 sceneNum);
+int Randomizer_CopyAltarMessage(char* buffer, const int maxBufferSize);
+int Randomizer_CopyHintFromCheck(RandomizerCheck check, char* buffer, const int maxBufferSize);
+int Randomizer_CopyGanonText(char* buffer, const int maxBufferSize);
+int Randomizer_CopyGanonHintText(char* buffer, const int maxBufferSize);
+void Randomizer_LoadHintLocations(const char* spoilerFileName);
+void Randomizer_LoadItemLocations(const char* spoilerFileName, bool silent);
+s16 Randomizer_GetItemModelFromId(s16 itemId);
+s32 Randomizer_GetItemIDFromGetItemID(s32 getItemId);
+s32 Randomizer_GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum);
+s32 Randomizer_GetItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 #endif
 
 #endif

soh/src/code/z_actor.c

@@ -5983,7 +5983,7 @@ s32 func_80038290(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar
 }
 
 s32 GetChestGameRandoGetItemId(s8 room, s16 ogDrawId, GlobalContext* globalCtx) {
-    if (GetRandoSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
+    if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) {
         // RANDOTODO update this logic when we implement keysanity
         // because 3drando replaces the keys not the rupees
         if (ogDrawId == GID_RUPEE_GREEN ||
@@ -5993,35 +5993,35 @@ s32 GetChestGameRandoGetItemId(s8 room, s16 ogDrawId, GlobalContext* globalCtx)
             switch(room) {
                 case 1:
                     if(!Flags_GetCollectible(globalCtx, 0x1B)) {
-                        return GetRandomizedItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, GI_RUPEE_GREEN);
+                        return Randomizer_GetItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_1, GI_RUPEE_GREEN);
                     }
                     break;
                 case 2:
                     if(!Flags_GetCollectible(globalCtx, 0x1C)) {
-                        return GetRandomizedItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, GI_RUPEE_GREEN);
+                        return Randomizer_GetItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_2, GI_RUPEE_GREEN);
                     }
                     break;
                 case 3:
                     if(!Flags_GetCollectible(globalCtx, 0x1D)) {
-                        return GetRandomizedItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, GI_RUPEE_BLUE);
+                        return Randomizer_GetItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_3, GI_RUPEE_BLUE);
                     }
                     break;
                 case 4:
                     if(!Flags_GetCollectible(globalCtx, 0x1E)) {
-                        return GetRandomizedItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, GI_RUPEE_BLUE);
+                        return Randomizer_GetItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_4, GI_RUPEE_BLUE);
                     }
                     break;
                 case 5:
                     if(!Flags_GetCollectible(globalCtx, 0x1F)) {
-                        return GetRandomizedItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, GI_RUPEE_RED);
+                        return Randomizer_GetItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_ITEM_5, GI_RUPEE_RED);
                     }
                     break;
             }
         }
     }
 
     if(ogDrawId == GID_HEART_PIECE) {
-        return GetRandomizedItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_REWARD, GI_HEART_PIECE);
+        return Randomizer_GetItemIdFromKnownCheck(RC_MARKET_TREASURE_CHEST_GAME_REWARD, GI_HEART_PIECE);
     }
 
     return GI_NONE;
@@ -6031,7 +6031,7 @@ s16 GetChestGameRandoGiDrawId(s8 room, s16 ogDrawId, GlobalContext* globalCtx) {
     s32 randoGetItemId = GetChestGameRandoGetItemId(room, ogDrawId, globalCtx);
 
     if(randoGetItemId != GI_NONE) {
-        return GetItemModelFromId(randoGetItemId);
+        return Randomizer_GetItemModelFromId(randoGetItemId);
     }
 
     return ogDrawId;

soh/src/code/z_demo.c

@@ -2124,7 +2124,7 @@ void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) {
 
             // If we are rando and tower escape skip is on, then set the flag to say we saw the towers fall
             // and exit.
-            if (gSaveContext.n64ddFlag && GetRandoSettingValue(RSK_SKIP_TOWER_ESCAPE)) {
+            if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SKIP_TOWER_ESCAPE)) {
                 return;
             }
             gSaveContext.cutsceneIndex = 0xFFF0;

soh/src/code/z_en_item00.c

@@ -509,7 +509,7 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
     }
 
     if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
-        getItemId = GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
+        getItemId = Randomizer_GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
         func_8002F554(&this->actor, globalCtx, getItemId);
     }
 
@@ -548,7 +548,7 @@ void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) {
     }
 
     if (this->actor.params == ITEM00_HEART_PIECE) {
-        if ((CVar_GetS32("gNewDrops", 0) !=0) && !gSaveContext.n64ddFlag) {
+        if (CVar_GetS32("gNewDrops", 0) && !gSaveContext.n64ddFlag) {
             this->actor.shape.yOffset = Math_SinS(this->actor.shape.rot.y) * 20.0f + 50.0f;
         } else {
             this->actor.shape.yOffset = Math_SinS(this->actor.shape.rot.y) * 150.0f + 850.0f;
@@ -881,7 +881,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
 
     if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
         if (gSaveContext.n64ddFlag) {
-            getItemId = GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
+            getItemId = Randomizer_GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
         }
         func_8002F554(&this->actor, globalCtx, getItemId);
     }
@@ -1300,11 +1300,11 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) {
     if ((gSaveContext.n64ddFlag && this->getItemId != GI_NONE) || this->actor.params == ITEM00_SMALL_KEY) {
         f32 mtxScale = 16.0f;
         Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-        s32 randoGetItemId = GetRandomizedItemId(this->getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
+        s32 randoGetItemId = Randomizer_GetRandomizedItemId(this->getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
         if (randoGetItemId >= GI_MINUET_OF_FOREST && randoGetItemId <= GI_DOUBLE_DEFENSE) {
             EnItem00_CustomItemsParticles(&this->actor, globalCtx, randoGetItemId);
         }
-        GetItem_Draw(globalCtx, GetItemModelFromId(randoGetItemId));
+        GetItem_Draw(globalCtx, Randomizer_GetItemModelFromId(randoGetItemId));
     } else {
         s32 texIndex = this->actor.params - 3;
 
@@ -1360,11 +1360,11 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) {
     if (gSaveContext.n64ddFlag) {
         f32 mtxScale = 16.0f;
         Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-        s32 randoGetItemId = GetRandomizedItemId(GI_HEART_PIECE, this->actor.id, this->ogParams, globalCtx->sceneNum);
+        s32 randoGetItemId = Randomizer_GetRandomizedItemId(GI_HEART_PIECE, this->actor.id, this->ogParams, globalCtx->sceneNum);
         if (randoGetItemId >= GI_MINUET_OF_FOREST && randoGetItemId <= GI_DOUBLE_DEFENSE) {
             EnItem00_CustomItemsParticles(&this->actor, globalCtx, randoGetItemId);
         }
-        GetItem_Draw(globalCtx, GetItemModelFromId(randoGetItemId));
+        GetItem_Draw(globalCtx, Randomizer_GetItemModelFromId(randoGetItemId));
     } else {
         s32 pad;
 

soh/src/code/z_message_PAL.c

@@ -1676,11 +1676,11 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
         // if we're rando'd and talking to a gossip stone
         if (gSaveContext.n64ddFlag &&
             textId == 0x2053 &&
-            GetRandoSettingValue(RSK_GOSSIP_STONE_HINTS) != 0 &&
-                (GetRandoSettingValue(RSK_GOSSIP_STONE_HINTS) == 1 ||
-                   (GetRandoSettingValue(RSK_GOSSIP_STONE_HINTS) == 2 &&
+            Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) != 0 &&
+                (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == 1 ||
+                   (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == 2 &&
                     Player_GetMask(globalCtx) == PLAYER_MASK_TRUTH) ||
-                   (GetRandoSettingValue(RSK_GOSSIP_STONE_HINTS) == 3 &&
+                   (Randomizer_GetSettingValue(RSK_GOSSIP_STONE_HINTS) == 3 &&
                    CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) {
 
             s16 actorParams = msgCtx->talkActor->params;
@@ -1700,14 +1700,14 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
                 }
             }
 
-            RandomizerCheck hintCheck = GetCheckFromActor(globalCtx->sceneNum, msgCtx->talkActor->id, actorParams);
+            RandomizerCheck hintCheck = Randomizer_GetCheckFromActor(globalCtx->sceneNum, msgCtx->talkActor->id, actorParams);
 
             // Pass the sizeof the message buffer so we don't hardcode any sizes and can rely on globals.
             // If no hint can be found, this just returns 0 size and doesn't modify the buffer, so no worries.
-            msgCtx->msgLength = font->msgLength = CopyHintFromCheck(hintCheck, font->msgBuf, sizeof(font->msgBuf));
+            msgCtx->msgLength = font->msgLength = Randomizer_CopyHintFromCheck(hintCheck, font->msgBuf, sizeof(font->msgBuf));
         } else if (gSaveContext.n64ddFlag && (textId == 0x7040 || textId == 0x7088)) {
             // rando hints at altar
-            msgCtx->msgLength = font->msgLength = CopyAltarMessage(font->msgBuf, sizeof(font->msgBuf));
+            msgCtx->msgLength = font->msgLength = Randomizer_CopyAltarMessage(font->msgBuf, sizeof(font->msgBuf));
         } else if (textId == 0x00b4 && CVar_GetS32("gInjectSkulltulaCount", 0) != 0) {
             switch (gSaveContext.language) {
                 case LANGUAGE_FRA:
@@ -1731,9 +1731,9 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) {
             msgCtx->msgLength = font->msgLength = CopyScrubMessage(textId, font->msgBuf, sizeof(font->msgBuf));
         } else if (gSaveContext.n64ddFlag && textId == 0x70CC) {
             if (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) {
-                msgCtx->msgLength = font->msgLength = CopyGanonText(font->msgBuf, sizeof(font->msgBuf));
+                msgCtx->msgLength = font->msgLength = Randomizer_CopyGanonText(font->msgBuf, sizeof(font->msgBuf));
             } else {
-                msgCtx->msgLength = font->msgLength = CopyGanonHintText(font->msgBuf, sizeof(font->msgBuf));
+                msgCtx->msgLength = font->msgLength = Randomizer_CopyGanonHintText(font->msgBuf, sizeof(font->msgBuf));
             }
         } else {
             msgCtx->msgLength = font->msgLength;