Skip to content

Fix bink Video playback #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kappa971 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bink Video playback #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c0e2ff
Fix Bink Video playback
Kappa971 May 12, 2024
4148e62
Fix Visual Studio 2022 compilation error
Kappa971 May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions TOMB5/game/savegame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions TOMB5/specific/fmv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down