Skip to content

Added support for Player.desired_player_class to DOD:S. (#475) #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordanbriere merged 3 commits into from
May 27, 2023
Merged

Added support for Player.desired_player_class to DOD:S. (#475) #477

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e65a44
Added support for Player.desired_player_class to DOD:S.
CookStar May 22, 2023
a1f3a14
Removed desired_player_class from ini.
CookStar May 23, 2023
d49e695
Added support for Player.player_class to DOD:S.
CookStar May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[property]

ragdoll = m_hRagdoll
desired_player_class = m_Shared.dodsharedlocaldata.m_iDesiredPlayerClass

[[eye_angle]]
name = m_angEyeAngles[0]
Expand Down
4 changes: 2 additions & 2 deletions src/core/modules/players/players_entity.cpp
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,12 +745,12 @@ void PlayerMixin::SetSuitPowerLoad(float value)

unsigned char PlayerMixin::GetDesiredPlayerClass()
{
static int offset = FindNetworkPropertyOffset("m_Shared.m_iDesiredPlayerClass");
static int offset = FindNetworkPropertyOffset(DESIRED_PLAYER_CLASS_PROPERTY);
return GetNetworkPropertyByOffset<unsigned char>(offset);
}

void PlayerMixin::SetDesiredPlayerClass(unsigned char value)
{
static int offset = FindNetworkPropertyOffset("m_Shared.m_iDesiredPlayerClass");
static int offset = FindNetworkPropertyOffset(DESIRED_PLAYER_CLASS_PROPERTY);
SetNetworkPropertyByOffset<unsigned char>(offset, value);
}
7 changes: 7 additions & 0 deletions src/core/modules/players/players_entity.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ using namespace boost::python;
#define PLAYER_CLASS_PROPERTY "m_iClass"
#endif

// Desired Player class property
#if defined(ENGINE_BRANCH_DODS)
#define DESIRED_PLAYER_CLASS_PROPERTY "m_Shared.dodsharedlocaldata.m_iDesiredPlayerClass"
#else
#define DESIRED_PLAYER_CLASS_PROPERTY "m_Shared.m_iDesiredPlayerClass"
#endif


//-----------------------------------------------------------------------------
// CBaseEntity extension class for players.
Expand Down