Merge pull request HarbourMasters#1663 from HarbourMasters/develop-zhora

zhora -> dev
Omnituens · Oct 1, 2022 · f3f357c · f3f357c
2 parents ec88b90 + 36e4066
commit f3f357c
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ project(Ship C CXX)
 
 set(PROJECT_VERSION_MAJOR "4")
 set(PROJECT_VERSION_MINOR "0")
-set(PROJECT_VERSION_PATCH "0")
+set(PROJECT_VERSION_PATCH "1")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
 add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_gx2.cpp
@@ -738,15 +738,11 @@ static std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> gfx_g
     }
 
     std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> res;
-    if (!coordinates.size()) {
-        return res;
-    }
-
-    GX2Rect srcRects[32];
-    GX2Point dstPoints[32];
+    GX2Rect srcRects[25];
+    GX2Point dstPoints[25];
     size_t num_coordinates = coordinates.size();
     while (num_coordinates > 0) {
-        size_t numRects = 32;
+        size_t numRects = 25;
         if (num_coordinates < numRects) {
             numRects = num_coordinates;
         }
@@ -755,8 +751,8 @@ static std::unordered_map<std::pair<float, float>, uint16_t, hash_pair_ff> gfx_g
         // initialize rects and points
         for (size_t i = 0; i < numRects; ++i) {
             const auto& c = *std::next(coordinates.begin(), num_coordinates + i);
-            const int32_t x = (int32_t) std::clamp(c.first, 0.0f, (float) buffer->depth_buffer.surface.width - 1);
-            const int32_t y = (int32_t) std::clamp(c.second, 0.0f, (float) buffer->depth_buffer.surface.height - 1);
+            const int32_t x = (int32_t) std::clamp(c.first, 0.0f, (float) (buffer->depth_buffer.surface.width - 1));
+            const int32_t y = (int32_t) std::clamp(c.second, 0.0f, (float) (buffer->depth_buffer.surface.height - 1));
 
             srcRects[i] = GX2Rect{
                 x,

diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh
@@ -25,6 +25,10 @@ while [[ ! -e "$SHIP_HOME"/oot.otr ]]; do
 			ROM=GC_NMQ_D;;
 		0227d7c0074f2d0ac935631990da8ec5914597b4)
 			ROM=GC_NMQ_PAL_F;;
+		50bebedad9e0f10746a52b07239e47fa6c284d03)
+			ROM=GC_MQ_D;;
+		079b855b943d6ad8bd1eb026c0ed169ecbdac7da)
+			ROM=GC_MQ_D;;	
 		*)
   			if [ -n "$ZENITY" ]; then
 				zenity --error --timeout=10 --text="ROM hash <b>$ROMHASH</b> does not match" --title="Incorrect ROM file" --width=500 --width=200

diff --git a/soh/macosx/Info.plist b/soh/macosx/Info.plist
@@ -9,7 +9,7 @@
     <key>CFBundleExecutable</key>
     <string>soh</string>
     <key>CFBundleGetInfoString</key>
-    <string>4.0.0</string>
+    <string>4.0.1</string>
     <key>CFBundleIconFile</key>
     <string>soh.icns</string>
     <key>CFBundleIdentifier</key>
@@ -22,11 +22,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>4.0.0</string>
+    <string>4.0.1</string>
     <key>CFBundleSignature</key>
     <string>ZOoT</string>
     <key>CFBundleVersion</key>
-    <string>4.0.0</string>
+    <string>4.0.1</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 2022 HarbourMasters.</string>
     <key>LSMinimumSystemVersion</key>

diff --git a/soh/macosx/soh-macos.sh b/soh/macosx/soh-macos.sh
@@ -40,6 +40,10 @@ while [ ! -e "$DATA_SHARE/oot.otr" ]; do
 		export ROM=GC_NMQ_D;;
 	0227d7c0074f2d0ac935631990da8ec5914597b4)
 		export ROM=GC_NMQ_PAL_F;;
+	50bebedad9e0f10746a52b07239e47fa6c284d03)
+		export ROM=GC_MQ_D;;
+	079b855b943d6ad8bd1eb026c0ed169ecbdac7da)
+		export ROM=GC_MQ_D;;	
 	*)
 		WRONGHASH="$(osascript -ss - "$ROMHASH" <<-EOF
 		display dialog "Incompatible ROM hash $ROMHASH" \

diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
@@ -27,6 +27,11 @@ void BootCommands_Init()
     CVar_RegisterS32("gHudColors", 1); //0 = N64 / 1 = NGC / 2 = Custom
 	CVar_RegisterS32("gInvertYAxis", 1);
     CVar_RegisterS32("gTrailDuration", 4); // 4 = Default trail duration
+    if (ResourceMgr_IsGameMasterQuest()) {
+        CVar_SetS32("gRandomizer", 0);
+    } else {
+        CVar_RegisterS32("gRandomizer", 0);
+    }
 #if defined(__SWITCH__) || defined(__WIIU__)
     CVar_RegisterS32("gControlNav", 1); // always enable controller nav on switch/wii u
 #endif

diff --git a/soh/soh/Enhancements/controls/GameControlEditor.cpp b/soh/soh/Enhancements/controls/GameControlEditor.cpp
@@ -238,7 +238,7 @@ namespace GameControlEditor {
         UIWidgets::PaddedEnhancementCheckbox("Right Stick Aiming", "gRightStickAiming");
         UIWidgets::Tooltip("Allows for aiming with the rights stick when:\n-Aiming in the C-Up view\n-Aiming with weapons");
 		ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 5);
-        UIWidgets::PaddedEnhancementCheckbox("Disable Auto-Centering in First Person View", "gAutoCenterView");
+        UIWidgets::PaddedEnhancementCheckbox("Disable Auto-Centering in First Person View", "gDisableAutoCenterView");
         UIWidgets::Tooltip("Prevents the C-Up view from auto-centering, allowing for Gyro Aiming");
 	}
 

diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp
@@ -117,8 +117,8 @@ namespace GameMenuBar {
         CVar_SetS32("gInvertYAxis", 1);
         // Right Stick Aiming
         CVar_SetS32("gRightStickAiming", 0);
-        // Auto-Center First Person View
-        CVar_SetS32("gAutoCenterView", 0);
+        // Disable Auto-Center First Person View
+        CVar_SetS32("gDisableAutoCenterView", 0);
 
         // Text Speed (1 to 5)
         CVar_SetS32("gTextSpeed", 1);

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
@@ -543,7 +543,10 @@ void SaveManager::SaveGlobal() {
     globalBlock["zTargetSetting"] = gSaveContext.zTargetSetting;
     globalBlock["language"] = gSaveContext.language;
 
-    std::ofstream output("Save/global.sav");
+    const std::filesystem::path sSavePath(Ship::Window::GetPathRelativeToAppDirectory("Save"));
+    const std::filesystem::path sGlobalPath = sSavePath / std::string("global.sav");
+
+    std::ofstream output(sGlobalPath);
     output << std::setw(4) << globalBlock << std::endl;
 }
 

diff --git a/soh/src/boot/build.c b/soh/src/boot/build.c
@@ -1,4 +1,4 @@
-const char gBuildVersion[] = "ZHORA ALFA (4.0.0)";
+const char gBuildVersion[] = "ZHORA BRAVO (4.0.1)";
 const char gBuildTeam[] = "github.com/harbourmasters";
 const char gBuildDate[] = __DATE__ " " __TIME__;
 const char gBuildMakeOption[] = "";
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -11177,7 +11177,7 @@ s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3) {
     s16 temp3;
 
     if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) {
-        if (CVar_GetS32("gAutoCenterView", 0)) {
+        if (!CVar_GetS32("gDisableAutoCenterView", 0)) {
             temp2 = sControlInput->rel.stick_y * 240.0f * (CVar_GetS32("gInvertYAxis", 1) ? -1 : 1);
             Math_SmoothStepToS(&this->actor.focus.rot.x, temp2, 14, 4000, 30);
 

diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1118,7 +1118,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
             gSP1Quadrangle(POLY_OPA_DISP++, 8, 10, 11, 9, 0);
         }
         //Draw MQ label
-        if (Save_GetSaveMetaInfo(i)->isMasterQuest) {
+        if (Save_GetSaveMetaInfo(i)->isMasterQuest && Save_GetSaveMetaInfo(i)->valid) {
             if (CVar_GetS32("gHudColors", 1) == 2 && FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) {
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, CVar_GetRGB("gCCFileChoosePrim", Background_Color).r, CVar_GetRGB("gCCFileChoosePrim", Background_Color).g, CVar_GetRGB("gCCFileChoosePrim", Background_Color).b, this->nameAlpha[i]);
             } else if (!FileChoose_IsSaveCompatible(Save_GetSaveMetaInfo(i))) {