OnlineCTR fixes

Author: Niko

decompile/General/AltMods/OnlineCTR/hooks.c

@@ -8,11 +8,6 @@ int OnlineGetNumDrivers()
 
 void octr_entryHook()
 {
-	// Until VehBirth_TeleportSelf is rewritten
-	// AdvHub, replace default spawn with unused
-	// start-line spawn, turn BEQ to JMP
-	*(char*)0x80058072 = 0;
-
 	// BOTS_Adv_AdjustDifficulty(); must be called before
 	// initializing any AI, either BOTS_Driver_Init or
 	// from BOTS_Driver_Convert. If AIs are wanted, then
@@ -116,12 +111,6 @@ void OnlineInit_Drivers(struct GameTracker* gGT)
 
 		// realID
 		dr->driverID = i+1;
-
-		#ifdef USE_60FPS
-		// needed cause VehBirth_TeleportSelf
-		// has not been rewritten yet for decomp
-		dr->instSelf->animFrame = FPS_DOUBLE(10);
-		#endif
 	}
 
 	// init, save
@@ -135,12 +124,6 @@ void OnlineInit_Drivers(struct GameTracker* gGT)
 	// realID
 	dr->driverID = 0;
 
-	#ifdef USE_60FPS
-	// needed cause VehBirth_TeleportSelf
-	// has not been rewritten yet for decomp
-	dr->instSelf->animFrame = FPS_DOUBLE(10);
-	#endif
-
 	for(i = i+1; i < octr->NumDrivers; i++)
 	{
 		if(octr->nameBuffer[i][0] == 0)
@@ -159,12 +142,6 @@ void OnlineInit_Drivers(struct GameTracker* gGT)
 
 		// realID
 		dr->driverID = i;
-
-		#ifdef USE_60FPS
-		// needed cause VehBirth_TeleportSelf
-		// has not been rewritten yet for decomp
-		dr->instSelf->animFrame = FPS_DOUBLE(10);
-		#endif
 	}
 
 	if (gGT->levelID != 0x26/*INTRO_RACE_TODAY*/) //was 0x26 (globe level)

decompile/General/Vehicle/VehBirth_0_TeleportSelf.c

@@ -52,6 +52,10 @@ void DECOMP_VehBirth_TeleportSelf(struct Driver *d, u_char spawnFlag, int spawnP
 		rotDeltaY = 0;
     }
 
+	// always spawn using the
+	// 8-place starting line
+	#ifndef USE_ONLINE
+	
 	// If just obtained Roo boss key
 	// spawn in front of hub door, beach-to-gemstone
 	else if (
@@ -154,6 +158,8 @@ void DECOMP_VehBirth_TeleportSelf(struct Driver *d, u_char spawnFlag, int spawnP
 		rotDeltaY = 0x400;
     }
 
+	#endif // USE_ONLINE
+	
 	// normal track,
 	// or advHub return from:
 	//		main menu

decompile/General/Vehicle/VehBirth_1_TeleportAll.c

@@ -33,11 +33,5 @@ void DECOMP_VehBirth_TeleportAll(struct GameTracker *gGT, u_int spawnFlags)
 
 		#endif
     }
-	
-	#ifdef USE_60FPS
-	// needed cause VehBirth_TeleportSelf
-	// has not been rewritten yet for decomp
-	d->instSelf->animFrame = FPS_DOUBLE(10);
-	#endif
   }
 }

include/common.h

@@ -29,6 +29,7 @@
 #define USE_RAMEX
 #define USE_BIGQUEUE
 #define USE_HIGH1P
+#define USE_DEFRAG
 
 //note: if you disable this, you'll need to fix anything related to the `ROOM_...` defines in global.h
 #define USE_RETROFUELED //enabled only in certain rooms.