Skip to content

Fix objects leaving the level via an "end of exit tunnel" side causing crashes #23

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
AlumiuN wants to merge 1 commit into
base: engine
Choose a base branch
from
Open

Fix objects leaving the level via an "end of exit tunnel" side causing crashes #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/Inferno/Game.Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,13 @@ namespace Inferno {

auto id = TraceSegment(level, obj.Segment, obj.Position);

if ((id == SegID::None || id == SegID::Exit) && obj.Segment == Game::Terrain.ExitTag.Segment) {
id = SegID::Terrain; // Assume that the object has entered the terrain
}
else if (id == SegID::None) {
SetFlag(obj.Flags, ObjectFlag::OutOfBounds);
return false;
if (id == SegID::None || id == SegID::Exit) {
if (obj.Segment == Game::Terrain.ExitTag.Segment)
id = SegID::Terrain; // Assume that the object has entered the terrain
else {
SetFlag(obj.Flags, ObjectFlag::OutOfBounds);
return false;
}
}

auto ref = Game::GetObjectRef(obj);
Expand Down