Fix rendering G1 videos in Fullscreen

kirides · Oct 27, 2020 · b2b496c · b2b496c
1 parent a3bb53d
commit b2b496c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/D3D11Engine/D3D11Engine.vcxproj b/D3D11Engine/D3D11Engine.vcxproj
@@ -134,7 +134,7 @@
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalOptions>/Zc:inline /Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>

diff --git a/D3D11Engine/D3D7/MyDirectDrawSurface7.cpp b/D3D11Engine/D3D7/MyDirectDrawSurface7.cpp
@@ -475,7 +475,7 @@ HRESULT MyDirectDrawSurface7::Unlock( LPRECT lpRect ) {
 			float brx = Engine::GraphicsEngine->GetResolution().x * scale;
 			float bry = Engine::GraphicsEngine->GetResolution().y * scale;
 
-#ifdef BUILD_GOTHIC_2_6_fix
+#if defined(BUILD_GOTHIC_2_6_fix) || defined(BUILD_GOTHIC_1_08k)
 			Engine::GraphicsEngine->DrawQuad( INT2( tlx, tly ),
 				INT2( brx - tlx, bry - tly ) );
 #else

diff --git a/D3D11Engine/GothicMemoryLocations1_08k.h b/D3D11Engine/GothicMemoryLocations1_08k.h
@@ -274,7 +274,7 @@ struct GothicMemoryLocations {
 
 	struct zCBinkPlayer {
 		static const unsigned int GetPixelFormat = 0x0043C9E0;
-		static const unsigned int OpenVideo = 0x00424E90;
+		static const unsigned int OpenVideo = 0x0043A660;
 		static const unsigned int Offset_VideoHandle = 0x30;
 	};
 

diff --git a/D3D11Engine/HookedFunctions.cpp b/D3D11Engine/HookedFunctions.cpp
@@ -72,7 +72,7 @@ void HookedFunctionInfo::InitHooks() {
 	// Hook the single bink-function
 	XHook( GothicMemoryLocations::zCBinkPlayer::GetPixelFormat, HookedFunctionInfo::hooked_zBinkPlayerGetPixelFormat );
 
-#ifdef BUILD_GOTHIC_2_6_fix
+#if defined(BUILD_GOTHIC_2_6_fix) || defined(BUILD_GOTHIC_1_08k)
 	XHook( original_zCBinkPlayerOpenVideo, GothicMemoryLocations::zCBinkPlayer::OpenVideo, HookedFunctionInfo::hooked_zBinkPlayerOpenVideo );
 #endif
 	original_Alg_Rotation3DNRad = (Alg_Rotation3DNRad)GothicMemoryLocations::Functions::Alg_Rotation3DNRad;