From 8f08aca15a2c13438e26cfe25e8aa17087ee6e3a Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 9 Nov 2025 22:51:50 +0100 Subject: [PATCH] chore: use nodiscard whenever applicable --- src/ObjLoading/Game/T6/BSP/BSPCalculation.h | 6 +++--- src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h | 4 ++-- src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h | 2 +- src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h | 2 +- src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h | 2 +- src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h | 2 +- src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h | 2 +- src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h | 2 +- src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/BSPCalculation.h b/src/ObjLoading/Game/T6/BSP/BSPCalculation.h index 9b6810db..15041766 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPCalculation.h +++ b/src/ObjLoading/Game/T6/BSP/BSPCalculation.h @@ -34,8 +34,8 @@ namespace BSP std::vector> objectList; void addObject(std::shared_ptr object); - BSPObject* getObject(size_t index) const; - size_t getObjectCount() const; + [[nodiscard]] BSPObject* getObject(size_t index) const; + [[nodiscard]] size_t getObjectCount() const; }; class BSPTree; @@ -50,7 +50,7 @@ namespace BSP float distance; // distance from the origin (0, 0, 0) to the plane BSPNode(std::unique_ptr frontTree, std::unique_ptr backTree, PlaneAxis nodeAxis, float nodeDistance); - PlaneSide objectIsInFront(const BSPObject& object) const; + [[nodiscard]] PlaneSide objectIsInFront(const BSPObject& object) const; }; class BSPTree diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h index c2a3b995..def45a20 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h @@ -12,11 +12,11 @@ namespace BSP public: BSPLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - bool linkBSP(const BSPData& bsp) const; + [[nodiscard]] bool linkBSP(const BSPData& bsp) const; private: T6::FootstepTableDef* addEmptyFootstepTableAsset(const std::string& assetName) const; - bool addDefaultRequiredAssets(const BSPData& bsp) const; + [[nodiscard]] bool addDefaultRequiredAssets(const BSPData& bsp) const; MemoryManager& m_memory; ISearchPath& m_search_path; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h index cdc28b71..c74ad9c9 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h @@ -13,7 +13,7 @@ namespace BSP public: ClipMapLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - T6::clipMap_t* linkClipMap(const BSPData& bsp); + [[nodiscard]] T6::clipMap_t* linkClipMap(const BSPData& bsp); private: MemoryManager& m_memory; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h index e202a92a..3f3652b2 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h @@ -11,7 +11,7 @@ namespace BSP { public: ComWorldLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - T6::ComWorld* linkComWorld(const BSPData& bsp) const; + [[nodiscard]] T6::ComWorld* linkComWorld(const BSPData& bsp) const; private: MemoryManager& m_memory; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h index 97137d3d..86c64a7e 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h @@ -11,7 +11,7 @@ namespace BSP { public: GameWorldMpLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - T6::GameWorldMp* linkGameWorldMp(const BSPData& bsp) const; + [[nodiscard]] T6::GameWorldMp* linkGameWorldMp(const BSPData& bsp) const; private: MemoryManager& m_memory; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h index 62fdd830..d5972301 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h @@ -11,7 +11,7 @@ namespace BSP { public: GfxWorldLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - T6::GfxWorld* linkGfxWorld(const BSPData& bsp) const; + [[nodiscard]] T6::GfxWorld* linkGfxWorld(const BSPData& bsp) const; private: MemoryManager& m_memory; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h index 8b162f36..4f796b2e 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h @@ -11,7 +11,7 @@ namespace BSP { public: MapEntsLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - T6::MapEnts* linkMapEnts(const BSPData& bsp) const; + [[nodiscard]] T6::MapEnts* linkMapEnts(const BSPData& bsp) const; private: MemoryManager& m_memory; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h index 27e91a10..e892114d 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h @@ -11,7 +11,7 @@ namespace BSP { public: SkinnedVertsLinker(MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context); - T6::SkinnedVertsDef* linkSkinnedVerts(const BSPData& bsp) const; + [[nodiscard]] T6::SkinnedVertsDef* linkSkinnedVerts(const BSPData& bsp) const; private: MemoryManager& m_memory; diff --git a/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp b/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp index 0207a40b..31ed3d39 100644 --- a/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp +++ b/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp @@ -18,7 +18,7 @@ namespace { } - std::optional GetHandlingAssetType() const override + [[nodiscard]] std::optional GetHandlingAssetType() const override { // don't handle any asset types return std::nullopt;