TR 2013 fix for patch 2021116

Author: FransBouma

Cameras/Tombraider/InjectableGenericCameraSystem/CameraManipulator.cpp

@@ -45,7 +45,7 @@ void SetTimeStopValue(byte newValue)
 	// set flag so camera works during menu driven timestop
 	_timeHasBeenStopped = (newValue == 1);
 	float* gamespeedAddress = reinterpret_cast<float*>(_gamespeedStructAddress + GAMESPEED_IN_STRUCT_OFFSET);
-	*gamespeedAddress = _timeHasBeenStopped ? 0.00001f : 1.0f;
+	*gamespeedAddress = _timeHasBeenStopped ? 0.000001f : 1.0f;
 }
 
 

Cameras/Tombraider/InjectableGenericCameraSystem/GameConstants.h

@@ -29,7 +29,7 @@
 
 // Mandatory constants to define for a game
 #define GAME_NAME									"Tomb Raider v1.1.748"
-#define CAMERA_VERSION								"1.0.2"
+#define CAMERA_VERSION								"1.0.3"
 #define CAMERA_CREDITS								"Otis_Inf. Thanks to Jim2Point0"
 #define GAME_WINDOW_TITLE							"Tomb Raider"
 #define INITIAL_PITCH_RADIANS						0.0f
@@ -39,21 +39,21 @@
 // End Mandatory constants
 
 // Offsets for camera intercept code. Used in interceptor.
-#define CAMERA_ADDRESS_INTERCEPT_START_OFFSET		0x5D43D2		
-#define CAMERA_ADDRESS_INTERCEPT_CONTINUE_OFFSET	0x5D43D8		
+#define CAMERA_ADDRESS_INTERCEPT_START_OFFSET		0x61DD8D		
+#define CAMERA_ADDRESS_INTERCEPT_CONTINUE_OFFSET	0x61DD98		
 
-#define	CAMERA_WRITE_INTERCEPT1_START_OFFSET		0x8BCC9		
-#define CAMERA_WRITE_INTERCEPT1_CONTINUE_OFFSET		0x8BCD0		
-#define	CAMERA_WRITE_INTERCEPT2_START_OFFSET		0x5D4439		
-#define CAMERA_WRITE_INTERCEPT2_CONTINUE_OFFSET		0x5D444E		
+#define	CAMERA_WRITE_INTERCEPT1_START_OFFSET		0xF4D29		
+#define CAMERA_WRITE_INTERCEPT1_CONTINUE_OFFSET		0xF4D30		
+#define	CAMERA_WRITE_INTERCEPT2_START_OFFSET		0x61DDA3		
+#define CAMERA_WRITE_INTERCEPT2_CONTINUE_OFFSET		0x61DDAE		
 
-#define GAMESPEED_ADDRESS_INTERCEPT_START_OFFSET	0x2E6254
-#define GAMESPEED_ADDRESS_INTERCEPT_CONTINUE_OFFSET 0x2E625A		
+#define GAMESPEED_ADDRESS_INTERCEPT_START_OFFSET	0x33D782
+#define GAMESPEED_ADDRESS_INTERCEPT_CONTINUE_OFFSET 0x33D788		
 
-#define FOV_WRITE_INTERCEPT1_START_OFFSET			0x5D4461
-#define FOV_WRITE_INTERCEPT1_CONTINUE_OFFSET		0x5D4467
-#define FOV_WRITE_INTERCEPT2_START_OFFSET			0x5CFF9A
-#define FOV_WRITE_INTERCEPT2_CONTINUE_OFFSET		0x5CFFA2
+#define FOV_WRITE_INTERCEPT1_START_OFFSET			0x61DDB3
+#define FOV_WRITE_INTERCEPT1_CONTINUE_OFFSET		0x61DDB9
+#define FOV_WRITE_INTERCEPT2_START_OFFSET			0x61A10C
+#define FOV_WRITE_INTERCEPT2_CONTINUE_OFFSET		0x61A111
 
 // Indices in the structures read by interceptors 
 #define LOOK_QUATERNION_IN_CAMERA_STRUCT_OFFSET		0x440			

Cameras/Tombraider/InjectableGenericCameraSystem/Interceptor.asm

@@ -61,34 +61,33 @@ cameraAddressInterceptor PROC
 	; Game jmps to this location due to the hook set in C function SetCameraStructInterceptorHook
 	mov [_cameraStructAddress], esi						; intercept address of camera struct
 exit:
-	mov [esi-60h],eax									; original statement
-	mov ecx,[edi+04h]
+	movups xmm0, xmmword ptr [esi+000003C0h] 
+	movups xmmword ptr [esi-50h],xmm0      
 	jmp [_cameraStructInterceptionContinue]				; jmp back into the original game code, which is the location after the original statements above.
 cameraAddressInterceptor ENDP
 
 
 gamespeedAddressInterceptor PROC
-	mov [_gamespeedStructAddress], esi
+	mov [_gamespeedStructAddress], edi
 	cmp byte ptr [_timeStopped], 1
 	je exit
 originalCode:
-	fstp dword ptr [esi+00000104h]
+	fstp dword ptr [edi+00000104h]
 exit:
 	jmp [_gamespeedInterceptionContinue]
 gamespeedAddressInterceptor ENDP
 
 
 fovWriteInterceptor1 PROC
 	; Game jmps to this location due to the hook set in C function SetFoVWriteInterceptorHooks. 
+	mov ecx,[ebp-04h]		
 	cmp dword ptr esi, [_cameraStructAddress]
 	jne originalCode
 	cmp byte ptr [_cameraEnabled], 1					; check if the user enabled the camera. If so, just skip the write statements, otherwise just execute the original code.
 	je exit												; our own camera is enabled, just skip the writes
 originalCode:
-	fstp dword ptr [esi-78h]							; original statement
+	fstp dword ptr [esi-78h]
 exit:
-	push ebx											; original statement
-	mov ecx,edi											; original statement
 	jmp [_fovWriteInterceptionContinue1]				; jmp back into the original game code which is the location after the original statements above.
 fovWriteInterceptor1 ENDP
 
@@ -99,8 +98,8 @@ fovWriteInterceptor2 PROC
 	je exit												; our own camera is enabled, just skip the writes
 originalCode:
 	fld dword ptr [eax+ecx+38h]							; original statement
-	lea eax,[eax+ecx+10h]								; original statement
 exit:
+	pop ebp
 	jmp [_fovWriteInterceptionContinue2]				; jmp back into the original game code which is the location after the original statements above.
 fovWriteInterceptor2 ENDP
 
@@ -112,12 +111,12 @@ fovWriteInterceptor2 ENDP
 
 cameraWriteInterceptor1 PROC
 	; Game jmps to this location due to the hook set in C function SetCameraWriteInterceptorHooks. 
-	cmp dword ptr esi, [_cameraStructAddressInterceptor1]
+	cmp dword ptr ecx, [_cameraStructAddressInterceptor1]
 	jne originalCode
 	cmp byte ptr [_cameraEnabled], 1					; check if the user enabled the camera. If so, just skip the write statements, otherwise just execute the original code.
 	je exit												; our own camera is enabled, just skip the writes
 originalCode:
-	movaps [esi+090h],xmm0
+	movaps [ecx+00000090h],xmm0
 exit:
 	jmp [_cameraWriteInterceptionContinue1]				; jmp back into the original game code which is the location after the original statements above.
 cameraWriteInterceptor1 ENDP
@@ -130,11 +129,8 @@ cameraWriteInterceptor2 PROC
 	cmp byte ptr [_cameraEnabled], 1					; check if the user enabled the camera. If so, just skip the write statements, otherwise just execute the original code.
 	je exit												; our own camera is enabled, just skip the writes
 originalCode:
-	mov [esi-30h],eax
-	mov ecx,[esi+000003E4h]
-	mov [esi-2Ch],ecx
-	mov edx,[esi+000003E8h]
-	mov [esi-28h],edx
+	movups xmm0, xmmword ptr [esi+000003E0h]	
+	movups xmmword ptr [esi-30h],xmm0		
 exit:
 	jmp [_cameraWriteInterceptionContinue2]	; jmp back into the original game code which is the location after the original statements above.
 cameraWriteInterceptor2 ENDP