From 3c0e2ffa471d02eb61b6fb1ca3ee1394442b6df3 Mon Sep 17 00:00:00 2001
From: Kappa971 <62349018+Kappa971@users.noreply.github.com>
Date: Mon, 13 May 2024 01:31:22 +0200
Subject: [PATCH 1/2] Fix Bink Video playback

---
 TOMB5/specific/fmv.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TOMB5/specific/fmv.cpp b/TOMB5/specific/fmv.cpp
index e97b4c37..b18f42cf 100644
--- a/TOMB5/specific/fmv.cpp
+++ b/TOMB5/specific/fmv.cpp
@@ -122,13 +122,13 @@ long PlayFmv(long num)
 	dm = App.DXInfo.nDisplayMode;
 	current = &modes[dm];
 
-	if (current->bpp != 16 || current->w != 640 || current->h != 480)
+	if (current->bpp != 32 || current->w != 640 || current->h != 480)
 	{
 		ndms = G_dxinfo->DDInfo[G_dxinfo->nDD].D3DDevices[G_dxinfo->nD3D].nDisplayModes;
 
 		for (int i = 0; i < ndms; i++, modes++)
 		{
-			if (modes->bpp == 16 && modes->w == 640 && modes->h == 480)
+			if (modes->bpp == 32 && modes->w == 640 && modes->h == 480)
 			{
 				App.DXInfo.nDisplayMode = i;
 				break;

From 4148e623121c1aa8b1a2eb9ec83ad51914c51e63 Mon Sep 17 00:00:00 2001
From: Kappa971 <62349018+Kappa971@users.noreply.github.com>
Date: Mon, 13 May 2024 01:32:30 +0200
Subject: [PATCH 2/2] Fix Visual Studio 2022 compilation error

---
 TOMB5/game/savegame.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/TOMB5/game/savegame.cpp b/TOMB5/game/savegame.cpp
index bdef2405..11d8e456 100644
--- a/TOMB5/game/savegame.cpp
+++ b/TOMB5/game/savegame.cpp
@@ -852,9 +852,6 @@ void RestoreLevelData(long FullSave)
 						ReadSG(creature, 22);
 						creature->enemy = (ITEM_INFO*)((long)creature->enemy + (long)malloc_buffer);
 
-						if (creature->enemy < 0)
-							creature->enemy = 0;
-
 						ReadSG(&creature->ai_target.object_number, sizeof(short));
 						ReadSG(&creature->ai_target.room_number, sizeof(short));
 						ReadSG(&creature->ai_target.box_number, sizeof(ushort));