R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dedicated.dll compile errors

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-10-13 02:41:09 +02:00
parent 50fee7414d
commit fb7f77f7cb
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
r5dev/materialsystem/cmaterialglue.h
View File

@ -1,4 +1,5 @@
#pragma once
#ifndef DEDICATED
#include "materialsystem/cshaderglue.h"
#include "public/imaterialinternal.h"
#include "public/materialsystem/shader_vcs_version.h"
@ -60,12 +61,16 @@ public:
}; //Size: 0x0130 confirmed end size.
static_assert(sizeof(CMaterialGlue) == 0x130);
#pragma pack(pop)
#endif // !DEDICATED
inline void* g_pMaterialGlueVFTable = nullptr;
/* ==== CMATERIALGLUE ================================================================================================================================================== */
#ifndef DEDICATED
inline CMemory p_GetMaterialAtCrossHair;
inline auto GetMaterialAtCrossHair = p_GetMaterialAtCrossHair.RCast<CMaterialGlue* (*)(void)>();
#endif // !DEDICATED
void CMaterialGlue_Attach();
void CMaterialGlue_Detach();
@ -74,14 +79,18 @@ class VMaterialGlue : public IDetour
{
virtual void GetAdr(void) const
{
#ifndef DEDICATED
spdlog::debug("| FUN: CMaterialGlue::GetMaterialAtCrossHair: {:#18x} |\n", p_GetMaterialAtCrossHair.GetPtr());
#endif // !DEDICATED
spdlog::debug("| CON: g_pMaterialGlueVFTable : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pMaterialGlueVFTable));
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
#ifndef DEDICATED
p_GetMaterialAtCrossHair = g_GameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x8B\xC4\x48\x83\xEC\x58\x48\x83\x3D\x00\x00\x00\x00\x00"), "xxxxxxxxxx?????");
GetMaterialAtCrossHair = p_GetMaterialAtCrossHair.RCast<CMaterialGlue* (*)(void)>(); /*48 8B C4 48 83 EC 58 48 83 3D ? ? ? ? ?*/
#endif // !DEDICATED
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const

2
r5dev/materialsystem/cmaterialsystem.cpp
View File

@ -113,6 +113,7 @@ bool IsMaterialInternal(void** pCandidate)
return false;
}
#ifndef DEDICATED
//-----------------------------------------------------------------------------
// Purpose: finds a material
// Input : *pMatSys -
@ -131,6 +132,7 @@ CMaterialGlue* CMaterialSystem::FindMaterialEx(CMaterialSystem* pMatSys, const c
}
return pMaterial;
}
#endif // !DEDICATED
///////////////////////////////////////////////////////////////////////////////
void CMaterialSystem_Attach()

6
r5dev/materialsystem/cmaterialsystem.h
View File

@ -1,5 +1,7 @@
#pragma once
#ifndef MATERIALSYSTEM_H
#define MATERIALSYSTEM_H
#include "cmaterialglue.h"
#define STREAM_DB_EXT "stbsp"
class CMaterialSystem
@ -98,3 +100,5 @@ class VMaterialSystem : public IDetour
///////////////////////////////////////////////////////////////////////////////
REGISTER(VMaterialSystem);
#endif // MATERIALSYSTEM_H