Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/game/server/neo/neo_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ LINK_ENTITY_TO_CLASS(player, CNEO_Player);

IMPLEMENT_SERVERCLASS_ST(CNEO_Player, DT_NEO_Player)
SendPropInt(SENDINFO(m_iNeoClass)),
SendPropInt(SENDINFO(m_iNeoSkin)),
SendPropInt(SENDINFO(m_iNeoStar)),
SendPropInt(SENDINFO(m_iNeoSkin), NumBitsForCount(NEO_SKIN_ENUM_COUNT), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_iNeoStar), NumBitsForCount(STAR__TOTAL), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_iClassBeforeTakeover)),
SendPropInt(SENDINFO(m_iXP)),
SendPropInt(SENDINFO(m_iLoadoutWepChoice)),
SendPropInt(SENDINFO(m_iLoadoutWepChoice), NumBitsForCount(MAX_WEAPON_LOADOUTS), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_iNextSpawnClassChoice)),
SendPropInt(SENDINFO(m_bInLean)),
SendPropInt(SENDINFO(m_bInLean), NumBitsForCount(NEO_LEAN_ENUM_COUNT), SPROP_UNSIGNED),
SendPropEHandle(SENDINFO(m_hServerRagdoll)),

SendPropBool(SENDINFO(m_bInThermOpticCamo)),
Expand All @@ -65,7 +65,7 @@ SendPropBool(SENDINFO(m_bIneligibleForLoadoutPick)),
SendPropBool(SENDINFO(m_bCarryingGhost)),

SendPropTime(SENDINFO(m_flCamoAuxLastTime)),
SendPropInt(SENDINFO(m_nVisionLastTick)),
SendPropInt(SENDINFO(m_nVisionLastTick), -1, SPROP_UNSIGNED),
SendPropTime(SENDINFO(m_flJumpLastTime)),

SendPropTime(SENDINFO(m_flNextPingTime)),
Expand Down
26 changes: 13 additions & 13 deletions src/game/shared/neo/neo_gamerules.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ REGISTER_GAMERULES_CLASS( CNEORules );
BEGIN_NETWORK_TABLE_NOBASE( CNEORules, DT_NEORules )
// NEO TODO (Rain): NEO specific game modes var (CTG/TDM/...)
#ifdef CLIENT_DLL
RecvPropFloat(RECVINFO(m_flNeoNextRoundStartTime)),
RecvPropFloat(RECVINFO(m_flNeoRoundStartTime)),
RecvPropFloat(RECVINFO(m_flPauseEnd)),
RecvPropTime(RECVINFO(m_flNeoNextRoundStartTime)),
RecvPropTime(RECVINFO(m_flNeoRoundStartTime)),
RecvPropTime(RECVINFO(m_flPauseEnd)),
RecvPropInt(RECVINFO(m_nRoundStatus)),
RecvPropInt(RECVINFO(m_nGameTypeSelected)),
RecvPropInt(RECVINFO(m_iRoundNumber)),
Expand All @@ -241,18 +241,18 @@ BEGIN_NETWORK_TABLE_NOBASE( CNEORules, DT_NEORules )
RecvPropInt(RECVINFO(m_iGhosterPlayer)),
RecvPropInt(RECVINFO(m_iEscortingTeam)),
RecvPropBool(RECVINFO(m_bGhostExists)),
RecvPropFloat(RECVINFO(m_flGhostLastHeld)),
RecvPropTime(RECVINFO(m_flGhostLastHeld)),
RecvPropVector(RECVINFO(m_vecGhostMarkerPos)),
RecvPropEHandle(RECVINFO(m_hGhost)),
RecvPropInt(RECVINFO(m_iJuggernautPlayerIndex)),
RecvPropBool(RECVINFO(m_bJuggernautItemExists)),
RecvPropEHandle(RECVINFO(m_hJuggernaut)),
#else
SendPropFloat(SENDINFO(m_flNeoNextRoundStartTime)),
SendPropFloat(SENDINFO(m_flNeoRoundStartTime)),
SendPropFloat(SENDINFO(m_flPauseEnd)),
SendPropInt(SENDINFO(m_nRoundStatus)),
SendPropInt(SENDINFO(m_nGameTypeSelected)),
SendPropTime(SENDINFO(m_flNeoNextRoundStartTime)),
SendPropTime(SENDINFO(m_flNeoRoundStartTime)),
SendPropTime(SENDINFO(m_flPauseEnd)),
SendPropInt(SENDINFO(m_nRoundStatus), NumBitsForCount(RoundStatusTotal), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_nGameTypeSelected), NumBitsForCount(NEO_GAME_TYPE__TOTAL), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_iRoundNumber)),
SendPropInt(SENDINFO(m_iHiddenHudElements)),
SendPropInt(SENDINFO(m_iForcedTeam)),
Expand All @@ -262,14 +262,14 @@ BEGIN_NETWORK_TABLE_NOBASE( CNEORules, DT_NEORules )
SendPropBool(SENDINFO(m_bCyberspaceLevel)),
SendPropString(SENDINFO(m_szNeoJinraiClantag)),
SendPropString(SENDINFO(m_szNeoNSFClantag)),
SendPropInt(SENDINFO(m_iGhosterTeam)),
SendPropInt(SENDINFO(m_iGhosterPlayer)),
SendPropInt(SENDINFO(m_iGhosterTeam), NumBitsForCount(TEAM__TOTAL), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_iGhosterPlayer), NumBitsForCount(MAX_PLAYERS_ARRAY_SAFE), SPROP_UNSIGNED),
SendPropInt(SENDINFO(m_iEscortingTeam)),
SendPropBool(SENDINFO(m_bGhostExists)),
SendPropFloat(SENDINFO(m_flGhostLastHeld)),
SendPropTime(SENDINFO(m_flGhostLastHeld)),
SendPropVector(SENDINFO(m_vecGhostMarkerPos), -1, SPROP_COORD_MP_LOWPRECISION | SPROP_CHANGES_OFTEN, MIN_COORD_FLOAT, MAX_COORD_FLOAT),
SendPropEHandle(SENDINFO(m_hGhost)),
SendPropInt(SENDINFO(m_iJuggernautPlayerIndex)),
SendPropInt(SENDINFO(m_iJuggernautPlayerIndex), NumBitsForCount(MAX_PLAYERS_ARRAY_SAFE), SPROP_UNSIGNED),
SendPropBool(SENDINFO(m_bJuggernautItemExists)),
SendPropEHandle(SENDINFO(m_hJuggernaut)),
#endif
Expand Down
2 changes: 2 additions & 0 deletions src/game/shared/neo/neo_gamerules.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ enum NeoRoundStatus {
PostRound,
Pause,
Countdown,

RoundStatusTotal
};

enum NeoWinReason {
Expand Down
4 changes: 2 additions & 2 deletions src/game/shared/neo/neo_ghost_cap_point.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ LINK_ENTITY_TO_CLASS(neo_ghost_retrieval_point, CNEOGhostCapturePoint);
IMPLEMENT_SERVERCLASS_ST(CNEOGhostCapturePoint, DT_NEOGhostCapturePoint)
SendPropFloat(SENDINFO(m_flCapzoneRadius)),

SendPropInt(SENDINFO(m_iOwningTeam)),
SendPropInt(SENDINFO(m_iSuccessfulCaptorClientIndex)),
SendPropInt(SENDINFO(m_iOwningTeam), NumBitsForCount(TEAM__TOTAL), SPROP_UNSIGNED),
Copy link
Collaborator

@Rainyan Rainyan Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since CNEOGhostCapturePoint::m_iOwningTeam can be a negative number (TEAM_ANY for neutral caps, or TEAM_INVALID for mapper error) as set by the logic in CNEOGhostCapturePoint::Spawn, I don't think we can safely use NumBitsForCount here.

SendPropInt(SENDINFO(m_iSuccessfulCaptorClientIndex), NumBitsForCount(MAX_PLAYERS_ARRAY_SAFE), SPROP_UNSIGNED),

SendPropBool(SENDINFO(m_bGhostHasBeenCaptured)),
SendPropBool(SENDINFO(m_bIsActive)),
Expand Down
3 changes: 3 additions & 0 deletions src/game/shared/neo/neo_player_shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,10 @@ enum NeoLeanDirectionE {
NEO_LEAN_NONE = 0,
NEO_LEAN_LEFT,
NEO_LEAN_RIGHT,

NEO_LEAN__ENUM_COUNT
};
static constexpr int NEO_LEAN_ENUM_COUNT = NEO_LEAN__ENUM_COUNT;

enum NeoWeponAimToggleE {
NEO_TOGGLE_NIL = 0,
Expand Down