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

Cleanup all redundant empty control statements

Browse Source
This commit is contained in:
Amos 2022-02-28 01:05:55 +01:00
parent 2719a85504
commit 0509fb0358
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/host_state.cpp
View File

@ -308,4 +308,4 @@ void CHostState_Detach()
}
///////////////////////////////////////////////////////////////////////////////
CHostState* g_pHostState = reinterpret_cast<CHostState*>(p_CHostState_FrameUpdate.FindPatternSelf("48 8D ?? ?? ?? ?? 01", ADDRESS::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr());;
CHostState* g_pHostState = reinterpret_cast<CHostState*>(p_CHostState_FrameUpdate.FindPatternSelf("48 8D ?? ?? ?? ?? 01", ADDRESS::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr());

2
r5dev/public/bansystem.cpp
View File

@ -265,4 +265,4 @@ bool CBanSystem::IsBanListValid(void) const
return !vsvBanList.empty();
}
///////////////////////////////////////////////////////////////////////////////
CBanSystem* g_pBanSystem = new CBanSystem();;
CBanSystem* g_pBanSystem = new CBanSystem();

2
r5dev/public/include/bansystem.h
View File

@ -22,7 +22,7 @@ public:
void BanListCheck(void);
private:
std::vector<std::pair<std::string, std::int64_t>> vsvrefuseList = {};;
std::vector<std::pair<std::string, std::int64_t>> vsvrefuseList = {};
std::vector<std::pair<std::string, std::int64_t>> vsvBanList = {};
};

2
r5dev/public/include/globalvars_base.h
View File

@ -27,7 +27,7 @@ public:
char m_nPad0[24]; // All unknown.
int m_nMaxClients; // Current maxplayers setting
int m_nMaxMilesAudioQueues_Maybe; // Only used on the server.
GameMode_t m_nGameMode;; // 1 (MP) 2 (PVE) 3 (SP)
GameMode_t m_nGameMode; // 1 (MP) 2 (PVE) 3 (SP)
int m_nTickCount; // Simulation ticks - does not increase when game is paused - resets on restart.
int m_nUnk0;
int m_nUnk1;

2
r5dev/thirdparty/lzham/lzham_huffman_codes.cpp vendored
View File

@ -211,7 +211,7 @@ namespace lzham
if ((!num_syms) || (num_syms > cHuffmanMaxSupportedSyms))
return false;
huffman_work_tables& state = *static_cast<huffman_work_tables*>(pContext);;
huffman_work_tables& state = *static_cast<huffman_work_tables*>(pContext);
uint max_freq = 0;
uint total_freq = 0;

2
r5dev/thirdparty/lzham/lzham_polar_codes.cpp vendored
View File

@ -364,7 +364,7 @@ namespace lzham
if ((!num_syms) || (num_syms > cPolarMaxSupportedSyms))
return false;
polar_work_tables& state = *static_cast<polar_work_tables*>(pContext);;
polar_work_tables& state = *static_cast<polar_work_tables*>(pContext);
uint max_freq = 0;
uint total_freq = 0;

8
r5dev/tier1/NetAdr2.cpp
View File

@ -416,13 +416,13 @@ void CNetAdr2::ToSockadr(sockaddr_storage* pSadr) const
else if (GetType() == netadrtype_t::NA_IP)
{
reinterpret_cast<sockaddr_in*>(pSadr)->sin_family = AF_INET;
reinterpret_cast<sockaddr_in*>(pSadr)->sin_port = htons(stoi(GetPort()));;
reinterpret_cast<sockaddr_in*>(pSadr)->sin_port = htons(stoi(GetPort()));
inet_pton(AF_INET, GetBase().c_str(), &reinterpret_cast<sockaddr_in*>(pSadr)->sin_addr.s_addr);
}
else if (GetType() == netadrtype_t::NA_LOOPBACK)
{
reinterpret_cast<sockaddr_in*>(pSadr)->sin_family = AF_INET;
reinterpret_cast<sockaddr_in*>(pSadr)->sin_port = htons(stoi(GetPort()));;
reinterpret_cast<sockaddr_in*>(pSadr)->sin_port = htons(stoi(GetPort()));
reinterpret_cast<sockaddr_in*>(pSadr)->sin_addr.s_addr = INADDR_LOOPBACK;
}
}
@ -431,13 +431,13 @@ void CNetAdr2::ToSockadr(sockaddr_storage* pSadr) const
if (GetType() == netadrtype_t::NA_IP)
{
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_family = AF_INET6;
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_port = htons(stoi(GetPort()));;
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_port = htons(stoi(GetPort()));
inet_pton(AF_INET6, GetBase().c_str(), &reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_addr);
}
else if (GetType() == netadrtype_t::NA_LOOPBACK)
{
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_family = AF_INET6;
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_port = htons(stoi(GetPort()));;
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_port = htons(stoi(GetPort()));
reinterpret_cast<sockaddr_in6*>(pSadr)->sin6_addr = in6addr_loopback;
}
}

2
r5dev/vpc/interfaces.h
View File

@ -35,7 +35,7 @@ class IFactory
public:
void GetFactoriesFromRegister();
void AddFactory(FactoryInfo factoryInfo);;
void AddFactory(FactoryInfo factoryInfo);
ADDRESS GetFactoryPtr(const std::string& factoryName, bool versionLess = true);
std::vector<FactoryInfo> factories = {};

2
r5dev/vpc/keyvalues.h
View File

@ -36,7 +36,7 @@ namespace
ADDRESS p_KeyValues_FindKey = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x56\x57\x41\x57\x48\x81\xEC\x00\x00\x00\x00\x45", "xxxxxxxx????x");
void* (*KeyValues_FindKey)(void* a1, const char* a2, bool a3) = (void* (*)(void*, const char*, bool))p_KeyValues_FindKey.GetPtr(); /*40 56 57 41 57 48 81 EC 30 01 00 00 45 0F B6 F8*/
#endif
ADDRESS p_KeyValues_LoadPlaylist = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\xE8\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x74\x0C", "x????xx?????xx").FollowNearCallSelf().GetPtr();;
ADDRESS p_KeyValues_LoadPlaylist = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\xE8\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x74\x0C", "x????xx?????xx").FollowNearCallSelf().GetPtr();
bool (*KeyValues_LoadPlaylist)(const char* source) = (bool (*)(const char*))p_KeyValues_LoadPlaylist.GetPtr(); /*E8 ?? ?? ?? ?? 80 3D ?? ?? ?? ?? ?? 74 0C*/
ADDRESS p_KeyValues_GetMemPool = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\x05\x00\x00\x00\x00\xC3\xCC\xCC\xCC\xCC\xCC\xCC\xCC\xCC\x48\x85\xD2", "xxx????xxxxxxxxxxxx");