From 10e28b8a5369ec37a3f552da31f50f24a655837e Mon Sep 17 00:00:00 2001 From: Mitch Richters Date: Sun, 5 Dec 2021 17:21:28 +1100 Subject: [PATCH] - SW: Add nullptr check inside `ActorTrackDecide()` for walltype's `nextSector()` to prevent crashes while noclipping through level. --- source/games/sw/src/track.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp index 891dc733c..3fbfcf049 100644 --- a/source/games/sw/src/track.cpp +++ b/source/games/sw/src/track.cpp @@ -3140,6 +3140,9 @@ bool ActorTrackDecide(TRACK_POINTp tpoint, DSWActor* actor) if (hit.hitWall == nullptr) return false; + if (hit.hitWall->nextSector() == nullptr) + return false; + zdiff = labs(sp->z - hit.hitWall->nextSector()->floorz) >> 8; u->jump_speed = PickJumpSpeed(actor, zdiff);