Merge pull request #186 from mateusfavarin/main

Update online version

Author: mateusfavarin

decompile/General/AltMods/OnlineCTR/global.h

@@ -1,7 +1,7 @@
 #ifndef ONLINE_GLOBAL_H
 #define ONLINE_GLOBAL_H
 
-#define VERSION 1018
+#define VERSION 1019
 //#define ONLINE_BETA_MODE
 
 #ifndef WINDOWS_INCLUDE
@@ -139,9 +139,9 @@ struct OnlineCTR
 
     // Last windowsClientSync counter
 	char lastWindowsClientSync;
-	
+
 	char desiredFPS;
-	
+
 	// control when PSX and PC send/recv
 	char sleepControl;
 	char gpuSubmitTooLate;

decompile/General/Vehicle/VehPhysForce_OnGravity.c

@@ -0,0 +1,36 @@
+#include <common.h>
+
+void VehPhysForce_OnGravity(struct Driver * driver, Vec3 * velocity)
+{
+    gte_SetRotMatrix(driver->matrixMovingDir);
+
+    Vec3 rotatedVelocity;
+    Matrix matrixMovingT;
+    const SVec3 vel = { .x = velocity->x, .y = velocity->y, .z = velocity->z };
+    TransposeMatrix(&matrixMovingT, &driver->matrixMovingDir);
+    MulMatrixVec_Light(&rotatedVelocity, &matrixMovingT, &vel);
+
+    Vec3 rotatedGravity;
+    SVec3 gravity = { .x = 0, .y = -driver->const_Gravity, .z = 0 };
+    if (driver->underDriver->quadFlags & QUAD_LOW_GRAVITY)
+    {
+        gravity.y = -(driver->const_Gravity * 41) / 100;
+    }
+    gravity.y = (gravity.y * sdata->gGT->elapsedTimeMS) / ELAPSED_MS;
+    MulVector_Light(&rotatedGravity, &gravity);
+
+    if (((rotatedGravity.z < 0) && (driver->unk_offset3B2 > 0)) ||
+        ((rotatedGravity.z > 0) && (driver->unk_offset3B2 < 0)))
+        {
+            rotatedGravity.z = 0;
+        }
+
+    if ((driver->actionsFlagSet & ACTION_PREVENT_ACCEL) ||
+        ((driver->baseSpeed > 0) && (driver->speedApprox < 0)) ||
+        ((driver->baseSpeed < 0) && (driver->speedApprox > 0)))
+        {
+            rotatedGravity.x = 0;
+            rotatedGravity.z = 0;
+        }
+
+}

tools/Launcher/ui.cpp

@@ -35,7 +35,7 @@ void UI::Render(int width, int height)
   if (m_username.size() > 9) { m_username = m_username.substr(0, 9); }
 
   bool updateReady = true;
-  updateReady &= SelectFile(m_gamePath, "Game Path", ".bin", {"Game Files", "*.bin"}, "Path to the NTSC-U version of CTR");
+  updateReady &= SelectFile(m_gamePath, "Game Path", ".bin", {"Game Files", "*.bin"}, "Path to the clean NTSC-U version of CTR");
   updateReady &= SelectFile(m_duckPath, "Duck Path ", ".exe", {"Executable Files", "*.exe"}, "Path to the duckstation executable");
   updateReady &= SelectFolder(m_iniPath, "Ini Path      ", "Duckstation gamesettings folder.\nUsually in Documents/DuckStation/gamesettings");
   ImGui::Text(("Version: " + m_version).c_str());