diff --git a/r5dev/bsplib/bsplib.cpp b/r5dev/bsplib/bsplib.cpp index 7275c5a8..6113d4f4 100644 --- a/r5dev/bsplib/bsplib.cpp +++ b/r5dev/bsplib/bsplib.cpp @@ -334,34 +334,33 @@ //----------------------------------------------------------------------------- // Purpose: calculates the view frustum culling data per static prop //----------------------------------------------------------------------------- -void* __fastcall BuildPropStaticFrustumCullMap(__int64 a1, int64_t a2, unsigned int a3, unsigned int a4, int64_t a5, int64_t a6, int64_t a7) +void* __fastcall BuildPropStaticFrustumCullMap(int64_t a1, int64_t a2, unsigned int a3, unsigned int a4, int64_t a5, int64_t a6, int64_t a7) { if (staticProp_defaultBuildFrustum->GetBool()) return v_BuildPropStaticFrustumCullMap(a1, a2, a3, a4, a5, a6, a7); - MDLHandle_t mdlhandle; // dx - studiohdr_t* studio; // rbx - int64_t v55; // rcx - int v56; // eax - int64_t v57; // rcx - int v58; // edx - int64_t v59; // rax - int64_t v60; // r13 - int v61; // eax - char* v62; // r13 - int64_t v63; // rdx - int v64; // er14 - char* v65; // rdi - int64_t v67; // r15 - void* v68; // rbx - int64_t v73; // [rsp+50h] [rbp-B8h] - __m128 v74{}; // [rsp+58h] [rbp-B0h] BYREF + MDLHandle_t handle; // dx + studiohdr_t *studio; // rbx + int64_t v55; // rcx + int v56; // eax + int64_t v57; // rcx + int v58; // edx + int64_t v59; // rax + int64_t v60; // r13 + int v61; // eax + char *v62; // r13 + int64_t v63; // rdx + int v64; // er14 + char *v65; // rdi + int64_t v67; // r15 + void *v68; // rbx + int64_t v73; // [rsp+50h] [rbp-B8h] - mdlhandle = *(unsigned __int16*)(a7 + 0x140); - studio = CMDLCache::FindMDL(g_MDLCache, mdlhandle, nullptr); - v55 = *(int64_t*)CMDLCache::GetStudioMaterialGlue(g_MDLCache, *(unsigned __int16*)(a7 + 320)); // Gets some object containing pointer to 2 CMaterialGlue vtables. - v56 = *(unsigned __int16*)(a5 + 0x20); - v57 = (int64_t)studio + 2 * v56 * studio->numskinref + studio->skinindex; + handle = *reinterpret_cast(a7 + 0x140); + studio = CMDLCache::FindMDL(g_MDLCache, handle, nullptr); + v55 = *reinterpret_cast(CMDLCache::GetStudioMaterialGlue(g_MDLCache, *reinterpret_cast((a7 + 320)))); // Gets some object containing pointer to 2 CMaterialGlue vtables. + v56 = *reinterpret_cast(a5 + 0x20); + v57 = reinterpret_cast(studio) + 2 * v56 * studio->numskinref + studio->skinindex; v58 = 0; if (studio->numbodyparts <= 0) return nullptr; @@ -371,8 +370,7 @@ void* __fastcall BuildPropStaticFrustumCullMap(__int64 a1, int64_t a2, unsigned { v60 = v59 + studio->bodypartindex; v61 = 0; - v62 = (char*)studio + v60; - v74.m128_u64[0] = (uint64_t)v62; + v62 = reinterpret_cast(studio) + v60; if (*((int*)v62 + 1) > 0) { v63 = 0i64; @@ -387,16 +385,15 @@ void* __fastcall BuildPropStaticFrustumCullMap(__int64 a1, int64_t a2, unsigned { v68 = *(void**)(v55 + 8i64 * *(__int16*)(v57 + 2i64 * *(int*)(v67 + *(int*)(v65 + 80) + v65))); - // Check bounds (data could only be within the '.data' segment. static CModule::ModuleSections_t mData = g_mGameDll.GetSectionByName(".data"); static CModule::ModuleSections_t mPData = g_mGameDll.GetSectionByName(".pdata"); - if ((uintptr_t)v68 < mData.m_pSectionBase || (uintptr_t)v68 > mPData.m_pSectionBase) + if (reinterpret_cast(v68) < mData.m_pSectionBase || + reinterpret_cast(v68) > mPData.m_pSectionBase) // Check bounds (data could only be within the '.data' segment. return nullptr; ++v64; v67 += 92i64; } while (v64 < *((int*)v65 + 19)); - v62 = (char*)v74.m128_u64[0]; } ++v61; v63 += 136i64; diff --git a/r5dev/bsplib/bsplib.h b/r5dev/bsplib/bsplib.h index 8f7ef5cb..7c7f0a94 100644 --- a/r5dev/bsplib/bsplib.h +++ b/r5dev/bsplib/bsplib.h @@ -4,25 +4,25 @@ inline CMemory p_BuildPropStaticFrustumCullMap; inline auto v_BuildPropStaticFrustumCullMap = p_BuildPropStaticFrustumCullMap.RCast(); -inline void** (*sub_1404365A0)(__m128*, const __m128i*, __m128i*, double) = nullptr; -inline __m128 (*sub_140270130)(__m128*) = nullptr; -inline const __m128i* (*sub_14028F170)(__int64, __int64, __m128*, const __m128i*, const __m128i*) = nullptr; -inline int64_t(*sub_140257F20)(void*, __int64, __m128i*, __int8*) = nullptr; +//inline void** (*sub_1404365A0)(__m128*, const __m128i*, __m128i*, double) = nullptr; +//inline __m128 (*sub_140270130)(__m128*) = nullptr; +//inline const __m128i* (*sub_14028F170)(__int64, __int64, __m128*, const __m128i*, const __m128i*) = nullptr; +//inline int64_t(*sub_140257F20)(void*, __int64, __m128i*, __int8*) = nullptr; +// +//inline int32_t* dword_1696A9D20 = nullptr; +//inline int32_t* dword_141744EBC = nullptr; +//inline int32_t* dword_141744EE8 = nullptr; +// +//inline int64_t* qword_141744EA8 = nullptr; +//inline int64_t* qword_141744EA0 = nullptr; +//inline int64_t* qword_141744E88 = nullptr; +// +//inline __m128* xmmword_1415BD270 = nullptr; +// +//inline void* off_141744E70 = nullptr; +//inline void* off_141731448 = nullptr; -inline int32_t* dword_1696A9D20 = nullptr; -inline int32_t* dword_141744EBC = nullptr; -inline int32_t* dword_141744EE8 = nullptr; - -inline int64_t* qword_141744EA8 = nullptr; -inline int64_t* qword_141744EA0 = nullptr; -inline int64_t* qword_141744E88 = nullptr; - -inline __m128* xmmword_1415BD270 = nullptr; - -inline void* off_141744E70 = nullptr; -inline void* off_141731448 = nullptr; - -void* __fastcall BuildPropStaticFrustumCullMap(__int64 a1, __int64 a2, unsigned int a3, unsigned int a4, __int64 a5, __int64 a6, __int64 a7); +void* __fastcall BuildPropStaticFrustumCullMap(int64_t a1, int64_t a2, unsigned int a3, unsigned int a4, int64_t a5, int64_t a6, int64_t a7); void BspLib_Attach(); void BspLib_Detach(); @@ -32,19 +32,19 @@ class HBspLib : public IDetour virtual void GetAdr(void) const { std::cout << "| FUN: BuildPropStaticFrustumCullMap : 0x" << std::hex << std::uppercase << p_BuildPropStaticFrustumCullMap.GetPtr() << std::setw(nPad) << " |" << std::endl; - std::cout << "| FUN: sub_1404365A0 : 0x" << std::hex << std::uppercase << sub_1404365A0 << std::setw(0) << " |" << std::endl; - std::cout << "| FUN: sub_140270130 : 0x" << std::hex << std::uppercase << sub_140270130 << std::setw(0) << " |" << std::endl; - std::cout << "| FUN: sub_14028F170 : 0x" << std::hex << std::uppercase << sub_14028F170 << std::setw(0) << " |" << std::endl; - std::cout << "| FUN: sub_140257F20 : 0x" << std::hex << std::uppercase << sub_140257F20 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: dword_1696A9D20 : 0x" << std::hex << std::uppercase << dword_1696A9D20 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: dword_141744EBC : 0x" << std::hex << std::uppercase << dword_141744EBC << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: dword_141744EE8 : 0x" << std::hex << std::uppercase << dword_141744EE8 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: qword_141744EA8 : 0x" << std::hex << std::uppercase << qword_141744EA8 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: qword_141744EA0 : 0x" << std::hex << std::uppercase << qword_141744EA0 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: qword_141744E88 : 0x" << std::hex << std::uppercase << qword_141744E88 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: xmmword_1415BD270 : 0x" << std::hex << std::uppercase << xmmword_1415BD270 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: off_141744E70 : 0x" << std::hex << std::uppercase << off_141744E70 << std::setw(0) << " |" << std::endl; - std::cout << "| VAR: off_141731448 : 0x" << std::hex << std::uppercase << off_141731448 << std::setw(0) << " |" << std::endl; + //std::cout << "| FUN: sub_1404365A0 : 0x" << std::hex << std::uppercase << sub_1404365A0 << std::setw(0) << " |" << std::endl; + //std::cout << "| FUN: sub_140270130 : 0x" << std::hex << std::uppercase << sub_140270130 << std::setw(0) << " |" << std::endl; + //std::cout << "| FUN: sub_14028F170 : 0x" << std::hex << std::uppercase << sub_14028F170 << std::setw(0) << " |" << std::endl; + //std::cout << "| FUN: sub_140257F20 : 0x" << std::hex << std::uppercase << sub_140257F20 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: dword_1696A9D20 : 0x" << std::hex << std::uppercase << dword_1696A9D20 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: dword_141744EBC : 0x" << std::hex << std::uppercase << dword_141744EBC << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: dword_141744EE8 : 0x" << std::hex << std::uppercase << dword_141744EE8 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: qword_141744EA8 : 0x" << std::hex << std::uppercase << qword_141744EA8 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: qword_141744EA0 : 0x" << std::hex << std::uppercase << qword_141744EA0 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: qword_141744E88 : 0x" << std::hex << std::uppercase << qword_141744E88 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: xmmword_1415BD270 : 0x" << std::hex << std::uppercase << xmmword_1415BD270 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: off_141744E70 : 0x" << std::hex << std::uppercase << off_141744E70 << std::setw(0) << " |" << std::endl; + //std::cout << "| VAR: off_141731448 : 0x" << std::hex << std::uppercase << off_141731448 << std::setw(0) << " |" << std::endl; std::cout << "+----------------------------------------------------------------+" << std::endl; } virtual void GetFun(void) const @@ -52,29 +52,29 @@ class HBspLib : public IDetour p_BuildPropStaticFrustumCullMap = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x8B\xC4\x44\x89\x40\x18\x48\x89\x50\x10\x55"), "xxxxxxxxxxxx"); /*48 8B C4 44 89 40 18 48 89 50 10 55*/ v_BuildPropStaticFrustumCullMap = p_BuildPropStaticFrustumCullMap.RCast(); - sub_1404365A0 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x8B\xC4\x48\x83\xEC\x78\xF3\x41\x0F\x10\x48\x00"), "xxxxxxxxxxxx?").RCast(); - sub_140270130 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x83\xEC\x28\x66\x0F\x6F\x15\x00\x00\x00\x00"), "xxxxxxxx????").RCast<__m128(*)(__m128*)>(); - sub_14028F170 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x83\xEC\x58\xF3\x41\x0F\x7E\x11"), "xxxxxxxxx").RCast(); - sub_140257F20 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x89\x5C\x24\x00\x57\x48\x83\xEC\x20\x49\x8B\xD9\x49\x8B\xF8\x48\x85\xD2"), "xxxx?xxxxxxxxxxxxxx").RCast<__int64(*)(void*, __int64, __m128i*, __int8*)>(); + //sub_1404365A0 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x8B\xC4\x48\x83\xEC\x78\xF3\x41\x0F\x10\x48\x00"), "xxxxxxxxxxxx?").RCast(); + //sub_140270130 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x83\xEC\x28\x66\x0F\x6F\x15\x00\x00\x00\x00"), "xxxxxxxx????").RCast<__m128(*)(__m128*)>(); + //sub_14028F170 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x83\xEC\x58\xF3\x41\x0F\x7E\x11"), "xxxxxxxxx").RCast(); + //sub_140257F20 = g_mGameDll.FindPatternSIMD(reinterpret_cast("\x48\x89\x5C\x24\x00\x57\x48\x83\xEC\x20\x49\x8B\xD9\x49\x8B\xF8\x48\x85\xD2"), "xxxx?xxxxxxxxxxxxxx").RCast<__int64(*)(void*, __int64, __m128i*, __int8*)>(); } virtual void GetVar(void) const { - dword_1696A9D20 = p_BuildPropStaticFrustumCullMap.FindPattern("89 0D").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); - dword_141744EBC = p_BuildPropStaticFrustumCullMap.Offset(0x200).FindPattern("44 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - dword_141744EE8 = p_BuildPropStaticFrustumCullMap.Offset(0x550).FindPattern("8B 15").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); - - qword_141744EA8 = p_BuildPropStaticFrustumCullMap.Offset(0x150).FindPattern("48 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - qword_141744EA0 = p_BuildPropStaticFrustumCullMap.Offset(0x220).FindPattern("48 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - qword_141744E88 = p_BuildPropStaticFrustumCullMap.Offset(0x4E0).FindPattern("48 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); - - xmmword_1415BD270 = p_BuildPropStaticFrustumCullMap.Offset(0x1A0).FindPattern("0F 59").ResolveRelativeAddressSelf(0x3, 0x7).RCast<__m128*>(); - - off_141744E70 = p_BuildPropStaticFrustumCullMap.Offset(0x550).FindPattern("4C 8D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); -#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) - off_141731448 = p_CalcPropStaticFrustumCulling.Offset(0x1F0).FindPattern("48 ?? ?? ?? ?? ?? 01").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); -#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3) - off_141731448 = p_BuildPropStaticFrustumCullMap.Offset(0x200).FindPattern("48 ?? ?? ?? ?? ?? 01").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); -#endif +// dword_1696A9D20 = p_BuildPropStaticFrustumCullMap.FindPattern("89 0D").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); +// dword_141744EBC = p_BuildPropStaticFrustumCullMap.Offset(0x200).FindPattern("44 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +// dword_141744EE8 = p_BuildPropStaticFrustumCullMap.Offset(0x550).FindPattern("8B 15").ResolveRelativeAddressSelf(0x2, 0x6).RCast(); +// +// qword_141744EA8 = p_BuildPropStaticFrustumCullMap.Offset(0x150).FindPattern("48 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +// qword_141744EA0 = p_BuildPropStaticFrustumCullMap.Offset(0x220).FindPattern("48 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +// qword_141744E88 = p_BuildPropStaticFrustumCullMap.Offset(0x4E0).FindPattern("48 8B").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +// +// xmmword_1415BD270 = p_BuildPropStaticFrustumCullMap.Offset(0x1A0).FindPattern("0F 59").ResolveRelativeAddressSelf(0x3, 0x7).RCast<__m128*>(); +// +// off_141744E70 = p_BuildPropStaticFrustumCullMap.Offset(0x550).FindPattern("4C 8D").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +//#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) +// off_141731448 = p_CalcPropStaticFrustumCulling.Offset(0x1F0).FindPattern("48 ?? ?? ?? ?? ?? 01").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +//#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3) +// off_141731448 = p_BuildPropStaticFrustumCullMap.Offset(0x200).FindPattern("48 ?? ?? ?? ?? ?? 01").ResolveRelativeAddressSelf(0x3, 0x7).RCast(); +//#endif } virtual void GetCon(void) const { } virtual void Attach(void) const { }