From 4562a0ca9757483cc31170611b4cc5ccd148ae53 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 12 Dec 2021 23:11:59 +1100 Subject: [PATCH] - SW: Add some nullptr checks to some inlines to prevent noclip crashes. --- source/games/sw/src/game.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index 47d9aa08a..34011b185 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -1893,17 +1893,17 @@ int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, i inline bool FAF_ConnectCeiling(sectortype* sect) { - return (sect->ceilingpicnum == FAF_MIRROR_PIC); + return (sect && sect->ceilingpicnum == FAF_MIRROR_PIC); } inline bool FAF_ConnectFloor(sectortype* sect) { - return (sect->floorpicnum == FAF_MIRROR_PIC); + return (sect && sect->floorpicnum == FAF_MIRROR_PIC); } inline bool FAF_ConnectArea(sectortype* sect) { - return (FAF_ConnectCeiling(sect) || FAF_ConnectFloor(sect)); + return sect && (FAF_ConnectCeiling(sect) || FAF_ConnectFloor(sect)); } bool PlayerCeilingHit(PLAYERp pp, int zlimit);