From 40799563564c57e8f9d34598fef07713aac3ec44 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 8 Apr 2023 18:52:33 +0200 Subject: [PATCH] Fix non-portable include paths Portable include paths are case sensitive. --- r5dev/game/server/detour_impl.h | 4 ++-- r5dev/game/shared/ai_utility_shared.cpp | 4 ++-- r5dev/game/shared/collisionproperty.h | 4 ++-- r5dev/public/ifilesystem.h | 2 +- r5dev/public/tier2/socketcreator.h | 2 +- r5dev/tier1/NetAdr.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/r5dev/game/server/detour_impl.h b/r5dev/game/server/detour_impl.h index 4e174afa..3a7d2d72 100644 --- a/r5dev/game/server/detour_impl.h +++ b/r5dev/game/server/detour_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "thirdparty/recast/detour/include/detourstatus.h" -#include "thirdparty/recast/detour/include/detournavmesh.h" +#include "thirdparty/recast/Detour/Include/DetourStatus.h" +#include "thirdparty/recast/Detour/Include/DetourNavMesh.h" #include "thirdparty/recast/Detour/Include/DetourNavMeshQuery.h" //------------------------------------------------------------------------- diff --git a/r5dev/game/shared/ai_utility_shared.cpp b/r5dev/game/shared/ai_utility_shared.cpp index 22690211..b34fb073 100644 --- a/r5dev/game/shared/ai_utility_shared.cpp +++ b/r5dev/game/shared/ai_utility_shared.cpp @@ -18,8 +18,8 @@ #include "game/server/ai_networkmanager.h" #include "game/server/ai_network.h" #include "game/client/viewrender.h" -#include "thirdparty/recast/detour/include/detourcommon.h" -#include "thirdparty/recast/detour/include/detournavmesh.h" +#include "thirdparty/recast/Detour/Include/DetourCommon.h" +#include "thirdparty/recast/Detour/Include/DetourNavMesh.h" //------------------------------------------------------------------------------ // Purpose: diff --git a/r5dev/game/shared/collisionproperty.h b/r5dev/game/shared/collisionproperty.h index 3d5d9688..fddd1bb6 100644 --- a/r5dev/game/shared/collisionproperty.h +++ b/r5dev/game/shared/collisionproperty.h @@ -8,9 +8,9 @@ #ifndef COLLISIONPROPERTY_H #define COLLISIONPROPERTY_H -#include "public/engine/ICollideable.h" #include "mathlib/vector.h" -#include "baseentity.h" +#include "engine/ICollideable.h" +#include "game/server/baseentity.h" class CCollisionProperty : public ICollideable { diff --git a/r5dev/public/ifilesystem.h b/r5dev/public/ifilesystem.h index 4adb5aed..a38c6d04 100644 --- a/r5dev/public/ifilesystem.h +++ b/r5dev/public/ifilesystem.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include typedef void* FileHandle_t; typedef void* FileNameHandle_t; // !TODO: Check if this is 4 or 8 bytes (model_t was 4 bytes in mem). diff --git a/r5dev/public/tier2/socketcreator.h b/r5dev/public/tier2/socketcreator.h index bea242a0..8a967612 100644 --- a/r5dev/public/tier2/socketcreator.h +++ b/r5dev/public/tier2/socketcreator.h @@ -1,5 +1,5 @@ #pragma once -#include "tier1/netadr.h" +#include "tier1/NetAdr.h" #include "common/igameserverdata.h" //----------------------------------------------------------------------------- diff --git a/r5dev/tier1/NetAdr.cpp b/r5dev/tier1/NetAdr.cpp index 17189302..1a930153 100644 --- a/r5dev/tier1/NetAdr.cpp +++ b/r5dev/tier1/NetAdr.cpp @@ -5,7 +5,7 @@ //===========================================================================// #include "core/stdafx.h" -#include "tier1/netadr.h" +#include "tier1/NetAdr.h" #include "tier1/strtools.h" #include "mathlib/swap.h" @@ -104,7 +104,7 @@ void CNetAdr::ToAdrinfo(addrinfo* pHint) const ////////////////////////////////////////////////////////////////////// void CNetAdr::Clear(void) { - adr = { 0 }; + adr = { }; port = 0; reliable = 0; type = netadrtype_t::NA_NULL;