Merge branch 'master'

X-Hax · Feb 26, 2016 · b7bce9f · b7bce9f
2 parents 0c152b5 + fb08953
commit b7bce9f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/SADXModLoader/FixFOV.cpp b/SADXModLoader/FixFOV.cpp
@@ -36,14 +36,10 @@ static void DisplayVideoFrame_FixAspectRatio()
 }
 
 // Fix for neglected width and height in global NJS_SCREEN
-static void __cdecl SetupScreenFix(NJS_MATRIX* m);
-static Trampoline SetupScreenTrampoline(0x00788240, 0x00788246, (DetourFunction)SetupScreenFix);
-static void __cdecl SetupScreenFix(NJS_MATRIX* m)
+FunctionPointer(void, SetupScreen, (NJS_SCREEN*), 0x00788240);
+static void __cdecl SetupScreenFix(NJS_SCREEN* screen)
 {
-	_nj_screen_.w = (*m)[1];	// Screen Width
-	_nj_screen_.h = (*m)[2];	// Screen Height
-	FunctionPointer(void, SetupScreen, (NJS_MATRIX* m), SetupScreenTrampoline.Target());
-	SetupScreen(m);
+	_nj_screen_ = *screen;
 }
 
 static void __cdecl njSetScreenDist_hook(Angle bams)
@@ -93,6 +89,8 @@ void ConfigureFOV()
 	const uint32_t width = HorizontalResolution;
 	const uint32_t height = VerticalResolution;
 
+	WriteJump(SetupScreen, SetupScreenFix);
+
 	// Taking advantage of a nullsub call.
 	WriteCall((void*)0x00513A88, DisplayVideoFrame_FixAspectRatio);