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

Work-in-progress user command executor

Browse Source 
* Added some getters in 'CBaseEntity' and 'CServerNetworkProperty'.
* Implemented 'CPlayer::SetTimeBase'.
* WIP implementation of 'CPlayer::RunNullCommand'.
This commit is contained in:
Kawe Mazidjatari 2023-01-19 15:25:45 +01:00
parent d4b576bd49
commit 54f08bd887
18 changed files with 348 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/game/server/gameinterface.h
View File

@ -4,6 +4,8 @@
//
// $NoKeywords: $
//=============================================================================//
#ifndef GAMEINTERFACE_H
#define GAMEINTERFACE_H
#include "public/eiface.h"
//-----------------------------------------------------------------------------
@ -83,3 +85,5 @@ class VServerGameDLL : public IDetour
///////////////////////////////////////////////////////////////////////////////
REGISTER(VServerGameDLL);
#endif // GAMEINTERFACE_H

15
r5dev/game/server/networkproperty.cpp
View File

@ -1,3 +1,16 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
// $NoKeywords: $
//===========================================================================//
#include "core/stdafx.h"
#include "public/baseentity.h"
#include "public/basehandle.h"
#include "public/basehandle.h"
#include "networkproperty.h"
edict_t CServerNetworkProperty::GetEdict(void) const
{
return m_edict;
}

5
r5dev/game/server/networkproperty.h
View File

@ -13,9 +13,14 @@
#include "public/iservernetworkable.h"
#include "public/server_class.h"
#include "public/edict.h"
struct CServerNetworkProperty : IServerNetworkable
{
public:
edict_t GetEdict() const;
private:
CBaseEntity* m_pOuter;
ServerClass* m_pServerClass;
int m_edict;

96
r5dev/game/server/player.cpp Normal file
View File

@ -0,0 +1,96 @@
//======== Copyright (c) Valve Corporation, All rights reserved. ============//
//
// Purpose:
//
//===========================================================================//
#include "core/stdafx.h"
#include "player.h"
#include "gameinterface.h"
#include "game/shared/shareddefs.h"
//------------------------------------------------------------------------------
// Purpose: executes a null command for this player
//------------------------------------------------------------------------------
void CPlayer::RunNullCommand(void)
{
float flOldFrameTime = g_pGlobals->m_fFrameTime;
float flOldCurTime = g_pGlobals->m_fCurTime;
pl.fixangle = FIXANGLE_NONE;
SetTimeBase(g_pGlobals->m_fCurTime);
// !TODO: Run command..
g_pGlobals->m_fFrameTime = flOldFrameTime;
g_pGlobals->m_fCurTime = flOldCurTime;
}
//------------------------------------------------------------------------------
// Purpose: gets the eye angles of this player
// Input : &angles -
// Output : QAngle*
//------------------------------------------------------------------------------
QAngle* CPlayer::EyeAngles(QAngle& angles)
{
return v_CPlayer__EyeAngles(this, &angles);
}
//------------------------------------------------------------------------------
// Purpose: sets the time base for this player
// Input : flTimeBase -
//------------------------------------------------------------------------------
inline void CPlayer::SetTimeBase(float flTimeBase)
{
float flTime = TIME_TO_TICKS(flTimeBase);
if (flTime < 0.0f)
flTime = 0.0f;
SetLastUCmdSimulationRemainderTime(flTime);
float flSomeTime = flTimeBase - m_lastUCmdSimulationRemainderTime * g_pGlobals->m_nTickInterval;
if (flSomeTime >= 0.0)
{
flTime = flSomeTime;
}
SetTotalExtraClientCmdTimeAttempted(flTime);
}
//------------------------------------------------------------------------------
// Purpose: sets the last user cmd simulation remainder time
// Input : flRemainderTime -
//------------------------------------------------------------------------------
void CPlayer::SetLastUCmdSimulationRemainderTime(float flRemainderTime)
{
if (m_lastUCmdSimulationRemainderTime != flRemainderTime)
{
edict_t nEdict = NetworkProp()->GetEdict();
if (nEdict != FL_EDICT_INVALID)
{
_InterlockedOr16(g_pGlobals->m_pUnk0 + nEdict + 32, 0x200u);
}
m_totalExtraClientCmdTimeAttempted = flRemainderTime;
}
}
//------------------------------------------------------------------------------
// Purpose: sets the total extra client cmd time attempted
// Input : flAttemptedTime -
//------------------------------------------------------------------------------
void CPlayer::SetTotalExtraClientCmdTimeAttempted(float flAttemptedTime)
{
if (m_totalExtraClientCmdTimeAttempted != flAttemptedTime)
{
edict_t nEdict = NetworkProp()->GetEdict();
if (nEdict != FL_EDICT_INVALID)
{
_InterlockedOr16(g_pGlobals->m_pUnk0 + nEdict + 32, 0x200u);
}
m_totalExtraClientCmdTimeAttempted = flAttemptedTime;
}
}

41
r5dev/game/server/player.h
View File

@ -231,6 +231,15 @@ struct SpeedChangeHistoryEntry
class CPlayer : public CBaseCombatCharacter
{
public:
void RunNullCommand(void);
QAngle* EyeAngles(QAngle& angles);
void SetTimeBase(float flTimeBase);
void SetLastUCmdSimulationRemainderTime(float flRemainderTime);
void SetTotalExtraClientCmdTimeAttempted(float flAttemptedTime);
private:
int m_StuckLast;
char gap_5a8c[4];
CPlayerLocalData m_Local;
@ -763,4 +772,36 @@ class CPlayer : public CBaseCombatCharacter
int m_armsModelIndex;
};
inline CMemory p_CPlayer__EyeAngles;
inline auto v_CPlayer__EyeAngles = p_CPlayer__EyeAngles.RCast<QAngle* (*)(CPlayer* pPlayer, QAngle* pAngles)>();
//inline CMemory p_CBaseEntity__GetBaseEntity;
//inline auto v_CBaseEntity__GetBaseEntity = p_CBaseEntity__GetBaseEntity.RCast<CBaseEntity* (*)(CBaseEntity* thisp)>();
///////////////////////////////////////////////////////////////////////////////
class VPlayer : public IDetour
{
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: CPlayer::EyeAngles : {:#18x} |\n", p_CPlayer__EyeAngles.GetPtr());
//spdlog::debug("| FUN: CBaseEntity::GetBaseEntity : {:#18x} |\n", p_CBaseEntity__GetBaseEntity.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
p_CPlayer__EyeAngles = g_GameDll.FindPatternSIMD("40 53 48 83 EC 30 F2 0F 10 05 ?? ?? ?? ??");
v_CPlayer__EyeAngles = p_CPlayer__EyeAngles.RCast<QAngle* (*)(CPlayer*, QAngle*)>();
//p_CBaseEntity__GetBaseEntity = g_GameDll.FindPatternSIMD("8B 91 ?? ?? ?? ?? 83 FA FF 74 1F 0F B7 C2 48 8D 0D ?? ?? ?? ?? C1 EA 10 48 8D 04 40 48 03 C0 39 54 C1 08 75 05 48 8B 04 C1 C3 33 C0 C3 CC CC CC 48 8B 41 30");
//v_CBaseEntity__GetBaseEntity = p_CBaseEntity__GetBaseEntity.RCast<CBaseEntity* (*)(CBaseEntity* thisp)>();
}
virtual void GetVar(void) const { }
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};
///////////////////////////////////////////////////////////////////////////////
REGISTER(VPlayer);
#endif // PLAYER_H

24
r5dev/game/shared/entitylist_base.cpp Normal file
View File

@ -0,0 +1,24 @@
//====== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. =======//
//
// Purpose:
//
//=============================================================================//
#include "core/stdafx.h"
#include "entitylist_base.h"
#include "public/ihandleentity.h"
// memdbgon must be the last include file in a .cpp file!!!
//#include "tier0/memdbgon.h"
enum
{
SERIAL_MASK = 0x7fff // the max value of a serial number, rolls back to 0 when it hits this limit
};
void CEntInfo::ClearLinks()
{
m_pPrev = m_pNext = this;
}
// !TODO: entity list.

30
r5dev/game/shared/entitylist_base.h Normal file
View File

@ -0,0 +1,30 @@
//====== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. =======//
//
// Purpose:
//
//=============================================================================//
#ifndef ENTITYLIST_BASE_H
#define ENTITYLIST_BASE_H
#ifdef _WIN32
#pragma once
#endif
#include "public/ihandleentity.h"
class CEntInfo
{
public:
IHandleEntity* m_pEntity;
int m_SerialNumber;
CEntInfo* m_pPrev;
CEntInfo* m_pNext;
#ifdef GAME_DLL
string_t m_iName;
string_t m_iClassName;
#endif
void ClearLinks();
};
#endif // ENTITYLIST_BASE_H

27
r5dev/game/shared/shareddefs.h Normal file
View File

@ -0,0 +1,27 @@
//======= Copyright (c) 1996-2009, Valve Corporation, All rights reserved. ======
//
// Purpose: Definitions that are shared by the game DLL and the client DLL.
//
//===============================================================================
#ifndef SHAREDDEFS_H
#define SHAREDDEFS_H
#ifdef _WIN32
#pragma once
#endif
#ifndef CLIENT_DLL
#include "game/server/gameinterface.h"
#define TICK_INTERVAL (g_pGlobals->m_nTickInterval)
#define TIME_TO_TICKS( dt ) ( (int)( 0.5f + (float)(dt) / TICK_INTERVAL ) )
#define TICKS_TO_TIME( t ) ( TICK_INTERVAL *( t ) )
#define ROUND_TO_TICKS( t ) ( TICK_INTERVAL * TIME_TO_TICKS( t ) )
#define TICK_NEVER_THINK (-1)
#endif // !CLIENT_DLL
#endif // SHAREDDEFS_H

39
r5dev/public/baseentity.cpp Normal file
View File

@ -0,0 +1,39 @@
//======= Copyright (c) 1996-2009, Valve Corporation, All rights reserved. ======
//
// Purpose: The base class from which all game entities are derived.
//
//===============================================================================
#include "core/stdafx.h"
#include "baseentity.h"
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
CCollisionProperty* CBaseEntity::CollisionProp()
{
return &m_Collision;
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
const CCollisionProperty* CBaseEntity::CollisionProp() const
{
return &m_Collision;
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
CServerNetworkProperty* CBaseEntity::NetworkProp()
{
return &m_Network;
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
const CServerNetworkProperty* CBaseEntity::NetworkProp() const
{
return &m_Network;
}

9
r5dev/public/baseentity.h
View File

@ -20,6 +20,15 @@
class CBaseEntity : public IServerEntity
{
// non-virtual methods. Don't override these!
public:
// An inline version the game code can use
CCollisionProperty* CollisionProp();
const CCollisionProperty* CollisionProp() const;
CServerNetworkProperty* NetworkProp();
const CServerNetworkProperty* NetworkProp() const;
private:
char m_RefEHandle[4];
char gap_c[4];
void* m_collideable;

7
r5dev/public/const.h
View File

@ -14,13 +14,18 @@
#define MAX_EDICTS (1<<MAX_EDICT_BITS)
// Used for networking ehandles.
#define NUM_ENT_ENTRY_BITS (MAX_EDICT_BITS + 2)
#define NUM_ENT_ENTRIES (1 << NUM_ENT_ENTRY_BITS)
#define NUM_ENT_ENTRIES (1 << NUM_ENT_ENTRY_BITS) // !TODO: is this correct?
#define INVALID_EHANDLE_INDEX 0xFFFFFFFF
#define NUM_SERIAL_NUM_BITS 16 // (32 - NUM_ENT_ENTRY_BITS)
#define NUM_SERIAL_NUM_SHIFT_BITS (32 - NUM_SERIAL_NUM_BITS)
#define ENT_ENTRY_MASK (( 1 << NUM_SERIAL_NUM_BITS) - 1)
// view angle update types for CPlayerState::fixangle
#define FIXANGLE_NONE 0
#define FIXANGLE_ABSOLUTE 1
#define FIXANGLE_RELATIVE 2
enum RenderMode_t
{
kRenderNormal = 0, // src

2
r5dev/sdklauncher/basepanel.cpp
View File

@ -19,7 +19,7 @@ void CUIBaseSurface::Init()
this->SuspendLayout();
this->SetAutoScaleDimensions({ 6, 13 });
this->SetAutoScaleMode(Forms::AutoScaleMode::Font);
this->SetText("SDK Launcher");
this->SetText("Launcher");
this->SetClientSize({ WindowX, WindowY });
this->SetFormBorderStyle(Forms::FormBorderStyle::FixedSingle);
this->SetStartPosition(Forms::FormStartPosition::CenterParent);

3
r5dev/vproj/clientsdk.vcxproj
View File

@ -64,6 +64,7 @@
<ClCompile Include="..\game\client\viewrender.cpp" />
<ClCompile Include="..\game\shared\animation.cpp" />
<ClCompile Include="..\game\shared\collisionproperty.cpp" />
<ClCompile Include="..\game\shared\entitylist_base.cpp" />
<ClCompile Include="..\inputsystem\inputsystem.cpp" />
<ClCompile Include="..\launcher\IApplication.cpp" />
<ClCompile Include="..\launcher\launcher.cpp" />
@ -234,8 +235,10 @@
<ClInclude Include="..\game\shared\animation.h" />
<ClInclude Include="..\game\shared\collisionproperty.h" />
<ClInclude Include="..\game\shared\ehandle.h" />
<ClInclude Include="..\game\shared\entitylist_base.h" />
<ClInclude Include="..\game\shared\playernet_vars.h" />
<ClInclude Include="..\game\shared\predictioncopy.h" />
<ClInclude Include="..\game\shared\shareddefs.h" />
<ClInclude Include="..\game\shared\shared_classnames.h" />
<ClInclude Include="..\game\shared\takedamageinfo.h" />
<ClInclude Include="..\inputsystem\ButtonCode.h" />

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

@ -657,6 +657,9 @@
<ClCompile Include="..\game\shared\collisionproperty.cpp">
<Filter>sdk\game\shared</Filter>
</ClCompile>
<ClCompile Include="..\game\shared\entitylist_base.cpp">
<Filter>sdk\game\shared</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -1922,6 +1925,12 @@
<ClInclude Include="..\game\shared\ehandle.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
<ClInclude Include="..\game\shared\entitylist_base.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
<ClInclude Include="..\game\shared\shareddefs.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

5
r5dev/vproj/dedicated.vcxproj
View File

@ -191,8 +191,10 @@
<ClInclude Include="..\game\shared\animation.h" />
<ClInclude Include="..\game\shared\collisionproperty.h" />
<ClInclude Include="..\game\shared\ehandle.h" />
<ClInclude Include="..\game\shared\entitylist_base.h" />
<ClInclude Include="..\game\shared\playernet_vars.h" />
<ClInclude Include="..\game\shared\predictioncopy.h" />
<ClInclude Include="..\game\shared\shareddefs.h" />
<ClInclude Include="..\game\shared\shared_classnames.h" />
<ClInclude Include="..\game\shared\takedamageinfo.h" />
<ClInclude Include="..\launcher\IApplication.h" />
@ -550,8 +552,10 @@
<ClCompile Include="..\game\server\ai_utility.cpp" />
<ClCompile Include="..\game\server\gameinterface.cpp" />
<ClCompile Include="..\game\server\networkproperty.cpp" />
<ClCompile Include="..\game\server\player.cpp" />
<ClCompile Include="..\game\shared\animation.cpp" />
<ClCompile Include="..\game\shared\collisionproperty.cpp" />
<ClCompile Include="..\game\shared\entitylist_base.cpp" />
<ClCompile Include="..\launcher\IApplication.cpp" />
<ClCompile Include="..\launcher\launcher.cpp" />
<ClCompile Include="..\launcher\prx.cpp" />
@ -587,6 +591,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp" />
<ClCompile Include="..\public\datamap.cpp" />
<ClCompile Include="..\public\networkvar.cpp" />
<ClCompile Include="..\public\utility\binstream.cpp" />

15
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -1356,6 +1356,12 @@
<ClInclude Include="..\game\shared\ehandle.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
<ClInclude Include="..\game\shared\entitylist_base.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
<ClInclude Include="..\game\shared\shareddefs.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\common\opcodes.cpp">
@ -1703,6 +1709,15 @@
<ClCompile Include="..\game\server\networkproperty.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\game\shared\entitylist_base.cpp">
<Filter>sdk\game\shared</Filter>
</ClCompile>
<ClCompile Include="..\game\server\player.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp">
<Filter>sdk\public</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\Dedicated.def" />

5
r5dev/vproj/gamesdk.vcxproj
View File

@ -70,9 +70,11 @@
<ClCompile Include="..\game\server\ai_utility.cpp" />
<ClCompile Include="..\game\server\gameinterface.cpp" />
<ClCompile Include="..\game\server\networkproperty.cpp" />
<ClCompile Include="..\game\server\player.cpp" />
<ClCompile Include="..\game\shared\ai_utility_shared.cpp" />
<ClCompile Include="..\game\shared\animation.cpp" />
<ClCompile Include="..\game\shared\collisionproperty.cpp" />
<ClCompile Include="..\game\shared\entitylist_base.cpp" />
<ClCompile Include="..\inputsystem\inputsystem.cpp" />
<ClCompile Include="..\launcher\IApplication.cpp" />
<ClCompile Include="..\launcher\launcher.cpp" />
@ -110,6 +112,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp" />
<ClCompile Include="..\public\datamap.cpp" />
<ClCompile Include="..\public\dt_recv.cpp" />
<ClCompile Include="..\public\networkvar.cpp" />
@ -264,8 +267,10 @@
<ClInclude Include="..\game\shared\animation.h" />
<ClInclude Include="..\game\shared\collisionproperty.h" />
<ClInclude Include="..\game\shared\ehandle.h" />
<ClInclude Include="..\game\shared\entitylist_base.h" />
<ClInclude Include="..\game\shared\playernet_vars.h" />
<ClInclude Include="..\game\shared\predictioncopy.h" />
<ClInclude Include="..\game\shared\shareddefs.h" />
<ClInclude Include="..\game\shared\shared_classnames.h" />
<ClInclude Include="..\game\shared\takedamageinfo.h" />
<ClInclude Include="..\inputsystem\ButtonCode.h" />

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

@ -702,6 +702,15 @@
<ClCompile Include="..\game\shared\collisionproperty.cpp">
<Filter>sdk\game\shared</Filter>
</ClCompile>
<ClCompile Include="..\game\shared\entitylist_base.cpp">
<Filter>sdk\game\shared</Filter>
</ClCompile>
<ClCompile Include="..\game\server\player.cpp">
<Filter>sdk\game\server</Filter>
</ClCompile>
<ClCompile Include="..\public\baseentity.cpp">
<Filter>sdk\public</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -2060,6 +2069,12 @@
<ClInclude Include="..\game\shared\ehandle.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
<ClInclude Include="..\game\shared\entitylist_base.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
<ClInclude Include="..\game\shared\shareddefs.h">
<Filter>sdk\game\shared</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">