OnlineCTR 60fps crashing fixes

CTR-tools · Jul 11, 2024 · 8ede8b0 · 8ede8b0
1 parent 33c0814
commit 8ede8b0
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 60 deletions.
diff --git a/decompile/General/AltMods/Mods4.c b/decompile/General/AltMods/Mods4.c
@@ -17,6 +17,45 @@ void RunVehicleThread(VehicleFuncPtr func, struct Thread* thread, struct Driver*
     func(thread, driver);
     if (restore) { sdata->gGT->gameMode1 |= END_OF_RACE; }
 }
+
+void RunVehicleSet13(struct Thread* dThread, struct Driver* dOnline)
+{
+	if(dThread->funcThTick != 0)
+		return;
+
+	// This only works because we have NO collision
+	// and therefore NO bounce physics, update P1
+	// first, then update other drivers later
+
+	// We can still "eventually" have mask-weapon
+	// collision, but no "bounce" physics with this logic
+
+	for(int iVar11 = 0; iVar11 < 13; iVar11++)
+	{
+		int pcVar5 = dOnline->funcPtrs[iVar11];
+
+		if(pcVar5 == 0)
+			continue;
+
+		RunVehicleThread(pcVar5, dThread, dOnline);
+
+		#ifdef USE_60FPS
+			#ifndef REBUILD_PS1
+				// if this function just ran
+				if(pcVar5 == VehFrameProc_Driving)
+				{
+					// only if jumping animation,
+					// otherwise wheelie gets bugged
+					if(dOnline->instSelf->animIndex == 3)
+					{
+						dOnline->matrixIndex =
+						dOnline->matrixIndex >> 1;
+					}
+				}
+			#endif
+		#endif
+	}
+}
 #endif
 
 #ifdef USE_ONLINE

diff --git a/decompile/General/MAIN/MainFrame_GameLogic.c b/decompile/General/MAIN/MainFrame_GameLogic.c
@@ -244,36 +244,7 @@ void DECOMP_MainFrame_GameLogic(struct GameTracker* gGT, struct GamepadSystem* g
 
 						DECOMP_VehPickupItem_ShootOnCirclePress(dOnline);
 
-						// This only works because we have NO collision
-						// and therefore NO bounce physics, update P1
-						// first, then update other drivers later
-
-						if(dThread->funcThTick == 0)
-							for(iVar11 = 0; iVar11 < 13; iVar11++)
-							{
-								pcVar5 = dOnline->funcPtrs[iVar11];
-
-								if(pcVar5 != 0)
-								{
-									RunVehicleThread(pcVar5, dThread, dOnline);
-
-									#ifdef USE_60FPS
-										#ifndef REBUILD_PS1
-											// if this function just ran
-											if(pcVar5 == VehFrameProc_Driving)
-											{
-												// only if jumping animation,
-												// otherwise wheelie gets bugged
-												if(psVar9->instSelf->animIndex == 3)
-												{
-													psVar9->matrixIndex =
-													psVar9->matrixIndex >> 1;
-												}
-											}
-										#endif
-									#endif
-								}
-							}
+						RunVehicleSet13(dThread, dOnline);
 
 						octr->sleepControl = 1;
 						octr->desiredFPS = FPS_DOUBLE(30);
@@ -290,32 +261,7 @@ void DECOMP_MainFrame_GameLogic(struct GameTracker* gGT, struct GamepadSystem* g
 
 						struct Thread* dThread = dOnline->instSelf->thread;
 
-						if(dThread->funcThTick == 0)
-							for(iVar11 = 0; iVar11 < 13; iVar11++)
-							{
-								pcVar5 = dOnline->funcPtrs[iVar11];
-
-								if(pcVar5 != 0)
-								{
-									RunVehicleThread(pcVar5, dThread, dOnline);
-
-									#ifdef USE_60FPS
-										#ifndef REBUILD_PS1
-											// if this function just ran
-											if(pcVar5 == VehFrameProc_Driving)
-											{
-												// only if jumping animation,
-												// otherwise wheelie gets bugged
-												if(psVar9->instSelf->animIndex == 3)
-												{
-													psVar9->matrixIndex =
-													psVar9->matrixIndex >> 1;
-												}
-											}
-										#endif
-									#endif
-								}
-							}
+						RunVehicleSet13(dThread, dOnline);
 					}
 				}
 

diff --git a/decompile/General/MAIN/MainFrame_RenderFrame.c b/decompile/General/MAIN/MainFrame_RenderFrame.c
@@ -336,15 +336,14 @@ void DECOMP_MainFrame_RenderFrame(struct GameTracker* gGT, struct GamepadSystem*
 		{
 			DECOMP_DotLights(gGT);
 
+			#ifndef USE_ONLINE
 			if((gGT->renderFlags & 0x8000) != 0)
 			{
 				WindowBoxLines(gGT);
 
-				#ifndef USE_ONLINE
 				WindowDivsionLines(gGT);
-				#endif
 			}
-
+			#endif
 		}
 
 #ifndef REBUILD_PS1
@@ -1507,6 +1506,7 @@ void MultiplayerWumpaHUD(struct GameTracker* gGT)
 	#endif
 }
 
+#ifndef USE_ONLINE
 void WindowBoxLines(struct GameTracker* gGT)
 {
 	int i;
@@ -1534,7 +1534,6 @@ void WindowBoxLines(struct GameTracker* gGT)
 	}
 }
 
-#ifndef USE_ONLINE
 void WindowDivsionLines(struct GameTracker* gGT)
 {
 	POLY_F4* p;