Skip to content

Fix turret explosion crash #73

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 turret explosion crash #73

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
763216a
fix turret explosion crash
Kappa971 May 8, 2024
294772c
Fix Visual Studio 2022 compilation error
Kappa971 May 8, 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
2 changes: 2 additions & 0 deletions TOMB4/game/gameflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "../specific/3dmath.h"
#include "lara.h"
#include "../tomb4/tomb4.h"
#include "../specific/lighting.h"

short CreditGroups[18] =
{
Expand Down Expand Up @@ -438,6 +439,7 @@ void DoLevel(uchar Name, uchar Audio)

gamestatus = 0;
SetFade(255, 0);
current_item = 0;

if (gfGameMode != 4)
{
Expand Down
3 changes: 0 additions & 3 deletions TOMB4/game/savegame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,9 +1007,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
1 change: 0 additions & 1 deletion TOMB4/specific/output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,6 @@ void phd_PutPolygonSkyMesh(short* objptr, long clipstatus)
clip_bottom = f_bottom;
clip_left = f_left;
clip_right = f_right;
current_item = 0;
ProcessObjectMeshVertices(mesh);
quad = mesh->gt4;

Expand Down