From 9114cf5d7dddd662a21815446a718b92a42145a7 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Mon, 10 Nov 2025 19:53:42 +0100 Subject: [PATCH] chore: replace explicit nullptr checks with negation checks --- .../Game/T6/BSP/Linker/BSPLinker.cpp | 26 +++++++++---------- .../Game/T6/BSP/Linker/GfxWorldLinker.cpp | 14 +++++----- src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp index 52c4cd36..8681cb3c 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp @@ -27,18 +27,18 @@ namespace BSP bool BSPLinker::addDefaultRequiredAssets(const BSPData& bsp) const { - if (m_context.LoadDependency(std::format("maps/mp/{}.gsc", bsp.name)) == nullptr) + if (!m_context.LoadDependency(std::format("maps/mp/{}.gsc", bsp.name))) return false; - if (m_context.LoadDependency(std::format("maps/mp/{}_amb.gsc", bsp.name)) == nullptr) + if (!m_context.LoadDependency(std::format("maps/mp/{}_amb.gsc", bsp.name))) return false; - if (m_context.LoadDependency(std::format("maps/mp/{}_fx.gsc", bsp.name)) == nullptr) + if (!m_context.LoadDependency(std::format("maps/mp/{}_fx.gsc", bsp.name))) return false; - if (m_context.LoadDependency(std::format("clientscripts/mp/{}.csc", bsp.name)) == nullptr) + if (!m_context.LoadDependency(std::format("clientscripts/mp/{}.csc", bsp.name))) return false; - if (m_context.LoadDependency(std::format("clientscripts/mp/{}_amb.csc", bsp.name)) == nullptr) + if (!m_context.LoadDependency(std::format("clientscripts/mp/{}_amb.csc", bsp.name))) return false; - if (m_context.LoadDependency(std::format("clientscripts/mp/{}_fx.csc", bsp.name)) == nullptr) + if (!m_context.LoadDependency(std::format("clientscripts/mp/{}_fx.csc", bsp.name))) return false; addEmptyFootstepTableAsset("default_1st_person"); @@ -48,7 +48,7 @@ namespace BSP addEmptyFootstepTableAsset("default_3rd_person_loud"); addEmptyFootstepTableAsset("default_ai"); - if (m_context.LoadDependency("animtrees/fxanim_props.atr") == nullptr) + if (!m_context.LoadDependency("animtrees/fxanim_props.atr")) return false; return true; @@ -74,32 +74,32 @@ namespace BSP SkinnedVertsLinker skinnedVertsLinker(m_memory, m_search_path, m_context); auto* comWorld = comWorldLinker.linkComWorld(bsp); - if (comWorld == nullptr) + if (!comWorld) return false; m_context.AddAsset(comWorld->name, comWorld); auto* mapEnts = mapEntsLinker.linkMapEnts(bsp); - if (mapEnts == nullptr) + if (!mapEnts) return false; m_context.AddAsset(mapEnts->name, mapEnts); auto* gameWorldMp = gameWorldMpLinker.linkGameWorldMp(bsp); - if (gameWorldMp == nullptr) + if (!gameWorldMp) return false; m_context.AddAsset(gameWorldMp->name, gameWorldMp); auto* skinnedVerts = skinnedVertsLinker.linkSkinnedVerts(bsp); - if (skinnedVerts == nullptr) + if (!skinnedVerts) return false; m_context.AddAsset(skinnedVerts->name, skinnedVerts); auto* gfxWorld = gfxWorldLinker.linkGfxWorld(bsp); // requires mapents asset - if (gfxWorld == nullptr) + if (!gfxWorld) return false; m_context.AddAsset(gfxWorld->name, gfxWorld); auto* clipMap = clipMapLinker.linkClipMap(bsp); // requires gfxworld and mapents asset - if (clipMap == nullptr) + if (!clipMap) return false; m_context.AddAsset(clipMap->name, clipMap); diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp index 70bfc43e..d0e7776f 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp @@ -87,11 +87,11 @@ namespace BSP surfMaterialName = BSPLinkingConstants::COLOR_ONLY_IMAGE_NAME; auto surfMaterialAsset = m_context.LoadDependency(surfMaterialName); - if (surfMaterialAsset == nullptr) + if (!surfMaterialAsset) { std::string missingImageName = BSPLinkingConstants::MISSING_IMAGE_NAME; surfMaterialAsset = m_context.LoadDependency(missingImageName); - if (surfMaterialAsset == nullptr) + if (!surfMaterialAsset) { con::error("unable to load the missing image texture {}!", missingImageName); return false; @@ -174,7 +174,7 @@ namespace BSP customMapModel* inModel = &projInfo->models[i]; auto xModelAsset = m_context.LoadDependency(inModel->name); - if (xModelAsset == nullptr) + if (!xModelAsset) { printf("XModel %s not found!\n", inModel->name.c_str()); currModel->model = nullptr; @@ -616,7 +616,7 @@ namespace BSP std::string probeImageName = "reflection_probe0"; auto probeImageAsset = m_context.LoadDependency(probeImageName); - if (probeImageAsset == nullptr) + if (!probeImageAsset) { con::error("ERROR! unable to find reflection probe image {}!", probeImageName); return false; @@ -635,7 +635,7 @@ namespace BSP std::string secondaryTexture = "lightmap0_secondary"; auto secondaryTextureAsset = m_context.LoadDependency(secondaryTexture); - if (secondaryTextureAsset == nullptr) + if (!secondaryTextureAsset) { con::error("ERROR! unable to find lightmap image {}!", secondaryTexture); return false; @@ -652,7 +652,7 @@ namespace BSP const auto skyBoxName = std::format("skybox_{}", projInfo.name); gfxWorld.skyBoxModel = m_memory.Dup(skyBoxName.c_str()); - if (m_context.LoadDependency(skyBoxName) == nullptr) + if (!m_context.LoadDependency(skyBoxName)) { con::warn("WARN: Unable to load the skybox xmodel {}!", skyBoxName); } @@ -719,7 +719,7 @@ namespace BSP const std::string outdoorImageName = std::string("$outdoor"); auto outdoorImageAsset = m_context.LoadDependency(outdoorImageName); - if (outdoorImageAsset == nullptr) + if (!outdoorImageAsset) { con::error("ERROR! unable to find outdoor image $outdoor!"); return false; diff --git a/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp b/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp index 31ed3d39..0dcbcb73 100644 --- a/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp +++ b/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp @@ -33,7 +33,7 @@ namespace bool FinalizeZone(AssetCreationContext& context) override { const auto bsp = BSP::createBSPData(m_zone.m_name, m_search_path); - if (bsp == nullptr) + if (!bsp) return false; BSPLinker linker(m_memory, m_search_path, context);