From e9ebc706580129c71601cd00283357ade31df062 Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Thu, 6 Nov 2025 23:23:27 +0100 Subject: [PATCH] fix: compilation on linux --- src/ObjLoading/Game/T6/BSP/BSPCalculation.h | 1 + src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp | 1 + src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp | 1 + src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp | 3 ++- src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp | 2 -- .../Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp | 10 +++++----- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/BSPCalculation.h b/src/ObjLoading/Game/T6/BSP/BSPCalculation.h index 67af108f..f2934a61 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPCalculation.h +++ b/src/ObjLoading/Game/T6/BSP/BSPCalculation.h @@ -3,6 +3,7 @@ #include "BSP.h" #include +#include namespace BSP { diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp index 0f7cc050..3c7095a6 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp @@ -7,6 +7,7 @@ #include "MapEntsLinker.h" #include "SkinnedVertsLinker.h" +#include #include using namespace T6; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp index ebd002d5..e36e631a 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp @@ -4,6 +4,7 @@ #include #include +#include using namespace T6; diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp index 207a1aee..ed14caea 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp @@ -5,6 +5,7 @@ #include "Utils/Pack.h" #include +#include #include using namespace T6; @@ -232,7 +233,7 @@ namespace BSP // visdata is written to by the game // all visdata is aligned by 128 - const auto alignedModelCount = utils::Align(modelCount, 128uz); + const auto alignedModelCount = utils::Align(modelCount, 128u); gfxWorld.dpvs.smodelVisDataCount = static_cast(alignedModelCount); gfxWorld.dpvs.smodelVisData[0] = m_memory.Alloc(alignedModelCount); gfxWorld.dpvs.smodelVisData[1] = m_memory.Alloc(alignedModelCount); diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp index 68c4b841..86bd5fe9 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp @@ -61,8 +61,6 @@ namespace } } } - - std::string loadMapEnts() {} } // namespace namespace BSP diff --git a/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp b/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp index 43cc6e0b..c32b6e13 100644 --- a/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp +++ b/src/ObjLoading/Game/T6/TechniqueSet/LoaderTechniqueSetT6.cpp @@ -33,7 +33,7 @@ namespace const auto js = nlohmann::json::parse(*file.m_stream.get()); std::string techSetName = js["name"]; - techniqueSet->name = _strdup(techSetName.c_str()); + techniqueSet->name = m_memory.Dup(techSetName.c_str()); techniqueSet->worldVertFormat = (unsigned char)js["worldVertFormat"]; for (int i = 0; i < 36; i++) @@ -50,7 +50,7 @@ namespace techniqueSet->techniques[i] = technique; std::string techName = techniqueJs["name"]; - technique->name = _strdup(techName.c_str()); + technique->name = m_memory.Dup(techName.c_str()); technique->flags = techniqueJs["flags"]; technique->passCount = techniqueJs["passCount"]; assert(technique->passCount == 1); @@ -91,7 +91,7 @@ namespace consts[1] = currArgJs["u"]["const1"]; consts[2] = currArgJs["u"]["const2"]; consts[3] = currArgJs["u"]["const3"]; - currArg->u.literalConst = (float(*)[4])consts; + currArg->u.literalConst = (float (*)[4])consts; } else { @@ -127,7 +127,7 @@ namespace currPass->pixelShader = new MaterialPixelShader; std::string pixelName = passJs["pixelShader"]["name"]; - currPass->pixelShader->name = _strdup(pixelName.c_str()); + currPass->pixelShader->name = m_memory.Dup(pixelName.c_str()); currPass->pixelShader->prog.ps = nullptr; const auto psFileName = shader::GetFileNameForPixelShaderAssetName(pixelName); @@ -151,7 +151,7 @@ namespace currPass->vertexShader = new MaterialVertexShader; std::string vertexName = passJs["vertexShader"]["name"]; - currPass->vertexShader->name = _strdup(vertexName.c_str()); + currPass->vertexShader->name = m_memory.Dup(vertexName.c_str()); currPass->vertexShader->prog.vs = nullptr; const auto vsFileName = shader::GetFileNameForVertexShaderAssetName(vertexName);