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

Split server/client specific game utils

Browse Source 
Split into their respective libraries, this is to avoid linker errors regarding undefined symbols.
This commit is contained in:
Kawe Mazidjatari 2023-07-19 02:27:28 +02:00
parent 54536a2652
commit 6ccf3baa5a
9 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/game/CMakeLists.txt
View File

@ -69,6 +69,8 @@ add_sources( SOURCE_GROUP "Server"
"server/player.cpp"
"server/player.h"
"server/playerlocaldata.h"
"server/util_server.cpp"
"server/util_server.h"
"server/vscript_server.cpp"
"server/vscript_server.h"
)
@ -95,6 +97,8 @@ add_sources( SOURCE_GROUP "Client"
"client/movehelper_client.cpp"
"client/movehelper_client.h"
"client/spritemodel.cpp"
"client/util_client.cpp"
"client/util_client.h"
"client/viewrender.cpp"
"client/viewrender.h"
"client/vscript_client.cpp"

8
r5dev/game/client/util_client.cpp Normal file
View File

@ -0,0 +1,8 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#include "util_client.h"
// Currently empty; add client specific game utils here...

9
r5dev/game/client/util_client.h Normal file
View File

@ -0,0 +1,9 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#ifndef UTIL_CLIENT_H
#define UTIL_CLIENT_H
#endif // UTIL_CLIENT_H

2
r5dev/game/server/gameinterface.cpp
View File

@ -16,7 +16,7 @@
#include "entitylist.h"
#include "baseanimating.h"
#include "game/shared/usercmd.h"
#include "game/shared/util_shared.h"
#include "game/server/util_server.h"
//-----------------------------------------------------------------------------
// This is called when a new game is started. (restart, map)

4
r5dev/game/server/physics_main.cpp
View File

@ -8,9 +8,9 @@
#include "tier1/cvar.h"
#include "player.h"
#include "physics_main.h"
#include "engine/server/server.h"
#include "engine/server/server.h"
#include "engine/client/client.h"
#include "game/shared/util_shared.h"
#include "game/server/util_server.h"
//-----------------------------------------------------------------------------
// Purpose: Runs the command simulation for fake players

25
r5dev/game/server/util_server.cpp Normal file
View File

@ -0,0 +1,25 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#include "game/server/player.h"
#include "game/server/gameinterface.h"
#include "util_server.h"
//-----------------------------------------------------------------------------
// Purpose: returns the player instance by edict
//-----------------------------------------------------------------------------
CPlayer* UTIL_PlayerByIndex(int nIndex)
{
if (nIndex < 1 || nIndex >(*g_pGlobals)->m_nMaxClients || nIndex == FL_EDICT_INVALID)
{
assert(0);
return nullptr;
}
// !TODO: Improve this!!!
CPlayer* pPlayer = reinterpret_cast<CPlayer*>((*g_pGlobals)->m_pEdicts[nIndex + 0x7808]);
return pPlayer;
}

12
r5dev/game/server/util_server.h Normal file
View File

@ -0,0 +1,12 @@
//===== Copyright <20> 1996-2005, Valve Corporation, All rights reserved. ======//
//
// Purpose:
//
//===========================================================================//
#ifndef UTIL_SERVER_H
#define UTIL_SERVER_H
#include "game/server/player.h"
CPlayer* UTIL_PlayerByIndex(int nIndex);
#endif // UTIL_SERVER_H

22
r5dev/game/shared/util_shared.cpp
View File

@ -5,28 +5,6 @@
//===========================================================================//
#include "core/stdafx.h"
#include "util_shared.h"
#ifndef CLIENT_DLL
#include "game/server/player.h"
#include "game/server/gameinterface.h"
#endif // !CLIENT_DLL
#ifndef CLIENT_DLL
//-----------------------------------------------------------------------------
// Purpose: returns the player instance by edict
//-----------------------------------------------------------------------------
CPlayer* UTIL_PlayerByIndex(int nIndex)
{
if (nIndex < 1 || nIndex >(*g_pGlobals)->m_nMaxClients || nIndex == FL_EDICT_INVALID)
{
assert(0);
return nullptr;
}
// !TODO: Improve this!!!
CPlayer* pPlayer = reinterpret_cast<CPlayer*>((*g_pGlobals)->m_pEdicts[nIndex + 0x7808]);
return pPlayer;
}
#endif // CLIENT_DLL
//-----------------------------------------------------------------------------
// Purpose: returns the class name, script name, and edict of the entity

8
r5dev/game/shared/util_shared.h
View File

@ -5,16 +5,9 @@
//===========================================================================//
#ifndef UTIL_SHARED_H
#define UTIL_SHARED_H
#ifndef CLIENT_DLL
#include "game/server/player.h"
#endif
#include "public/engine/IEngineTrace.h"
class CTraceFilterSimple;
#ifndef CLIENT_DLL
CPlayer* UTIL_PlayerByIndex(int nIndex);
#endif // CLIENT_DLL
const char* UTIL_GetEntityScriptInfo(CBaseEntity* pEnt);
inline CMemory p_UTIL_GetEntityScriptInfo;
@ -46,7 +39,6 @@ private:
int m_traceType;
};
///////////////////////////////////////////////////////////////////////////////
class VUtil_Shared : public IDetour
{