From d49185c291d369e99302bfe39ff498a17066cc37 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Wed, 3 Dec 2025 23:20:26 +0200 Subject: [PATCH] Move nullptr check to be checked first Kinda defeats the purpose of checking for nullptr if we dereference it before the check, no? --- Strategic/Facilities.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Strategic/Facilities.cpp b/Strategic/Facilities.cpp index 749ac4c8..82a8e6b2 100644 --- a/Strategic/Facilities.cpp +++ b/Strategic/Facilities.cpp @@ -1993,8 +1993,8 @@ INT32 GetTotalFacilityHourlyCosts( BOOLEAN fPositive ) pSoldier = gCharactersList[ ubCounter ].usSolID; // Is character truly valid? - if( !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) && - pSoldier->bSectorZ == 0 && pSoldier != NULL && + if( pSoldier != NULL && !( pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ) && + pSoldier->bSectorZ == 0 && pSoldier->stats.bLife >= OKLIFE && !(pSoldier->flags.fMercAsleep) ) {