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

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-04-05 01:13:27 +02:00
parent 60cd5a000a
commit f4b263b412
8 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/engine/net_chan.h
View File

@ -15,7 +15,7 @@
#include "public/include/inetchannel.h"
#define NET_FRAMES_BACKUP 128
#define NET_LEN_CHANNELNAME 32
#define NET_CHANNELNAME_MAXLEN 32
#define NET_FRAMES_MASK (NET_FRAMES_BACKUP-1)
//-----------------------------------------------------------------------------
@ -160,7 +160,7 @@ private:
int m_nSequencesSkipped_MAYBE;
int m_nSessionRecvs;
uint32_t m_nLiftimeRecvs;
char m_Name[NET_LEN_CHANNELNAME];
char m_Name[NET_CHANNELNAME_MAXLEN];
uint8_t m_bRetrySendLong;
v_netadr_t remote_address;
};

7
r5dev/game/client/c_baseentity.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef C_BASEENTITY_H
#define C_BASEENTITY_H
// How many data slots to use when in multiplayer.
#define MULTIPLAYER_BACKUP 750
#endif // C_BASEENTITY_H

2
r5dev/server/vengineserver_impl.cpp
View File

@ -23,7 +23,7 @@ bool HIVEngineServer__PersistenceAvailable(void* entidx, int clientidx)
{
CNetChan* pNetChan = pClient->GetNetChan();
string svClientName(pNetChan->GetName(), NET_LEN_CHANNELNAME);
string svClientName(pNetChan->GetName(), NET_CHANNELNAME_MAXLEN);
string svIpAddress = pNetChan->GetAddress();
int64_t nOriginID = pClient->GetOriginID();

24
r5dev/tier0/completion.cpp
View File

@ -13,6 +13,7 @@
#include "engine/cl_rcon.h"
#endif // !DEDICATED
#include "engine/net.h"
#include "engine/net_chan.h"
#include "engine/sys_utils.h"
#include "engine/baseclient.h"
#include "rtech/rtech_game.h"
@ -66,31 +67,26 @@ void _Kick_f_CompletionFunc(const CCommand& args)
for (int i = 0; i < MAX_PLAYERS; i++)
{
CBaseClient* client = g_pClient->GetClient(i);
if (!client)
CBaseClient* pClient = g_pClient->GetClient(i);
CNetChan* pNetChan = pClient->GetNetChan();
if (!pClient || !pNetChan)
{
continue;
}
if (!client->GetNetChan())
std::string svClientName(pNetChan->GetName(), NET_CHANNELNAME_MAXLEN); // Get full name.
if (svClientName.empty())
{
continue;
}
void* clientNamePtr = (void**)(((std::uintptr_t)client->GetNetChan()) + 0x1A8D); // Get client name from netchan.
std::string clientName((char*)clientNamePtr, 32); // Get full name.
if (clientName.empty())
if (strcmp(args.Arg(1), svClientName.c_str()) != 0) // Our wanted name?
{
continue;
}
if (strcmp(args.Arg(1), clientName.c_str()) != 0) // Our wanted name?
{
continue;
}
NET_DisconnectClient(client, i, "Kicked from Server", 0, 1);
NET_DisconnectClient(pClient, i, "Kicked from Server", 0, 1);
}
}
@ -183,7 +179,7 @@ void _Ban_f_CompletionFunc(const CCommand& args)
continue;
}
std::string svClientName(pNetChan->GetName(), NET_LEN_CHANNELNAME); // Get full name.
std::string svClientName(pNetChan->GetName(), NET_CHANNELNAME_MAXLEN); // Get full name.
if (svClientName.empty())
{

1
r5dev/vproj/clientsdk.vcxproj
View File

@ -137,6 +137,7 @@
<ClInclude Include="..\engine\sys_utils.h" />
<ClInclude Include="..\gameui\IConsole.h" />
<ClInclude Include="..\gameui\IBrowser.h" />
<ClInclude Include="..\game\client\c_baseentity.h" />
<ClInclude Include="..\inputsystem\ButtonCode.h" />
<ClInclude Include="..\inputsystem\inputsystem.h" />
<ClInclude Include="..\launcher\IApplication.h" />

9
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -157,6 +157,12 @@
<Filter Include="sdk\rtech\stryder">
<UniqueIdentifier>{cbbed3bf-8879-4269-a518-c526199d95af}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\game">
<UniqueIdentifier>{45d6a508-a869-4d81-8701-9e4125ed1f7e}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\game\client">
<UniqueIdentifier>{0b043c41-b53e-44f5-9cbe-7501fcf22478}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\cdll_engine_int.cpp">
@ -1133,6 +1139,9 @@
<ClInclude Include="..\client\vengineclient_impl.h">
<Filter>sdk\client</Filter>
</ClInclude>
<ClInclude Include="..\game\client\c_baseentity.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

1
r5dev/vproj/gamesdk.vcxproj
View File

@ -147,6 +147,7 @@
<ClInclude Include="..\engine\sys_utils.h" />
<ClInclude Include="..\gameui\IConsole.h" />
<ClInclude Include="..\gameui\IBrowser.h" />
<ClInclude Include="..\game\client\c_baseentity.h" />
<ClInclude Include="..\game\server\ai_network.h" />
<ClInclude Include="..\game\server\ai_networkmanager.h" />
<ClInclude Include="..\game\server\ai_node.h" />

6
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -166,6 +166,9 @@
<Filter Include="sdk\rtech\stryder">
<UniqueIdentifier>{2535a97c-967a-40af-bb52-02033747b4f0}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\game\client">
<UniqueIdentifier>{be813705-b786-4439-b785-eff6bb5f194f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\vengineclient_impl.cpp">
@ -1199,6 +1202,9 @@
<ClInclude Include="..\tier1\bitbuf.h">
<Filter>sdk\tier1</Filter>
</ClInclude>
<ClInclude Include="..\game\client\c_baseentity.h">
<Filter>sdk\game\client</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">