Skip to content

Rename handlers and events for entity processing consistency #3925

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

Closed
wants to merge 3 commits into from
Closed

Rename handlers and events for entity processing consistency #3925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
697220b
Rename handlers and events for entity processing consistency
lynconsix Jan 4, 2025
7bc617c
Rename event from onClientEntitiesProcessed to onClientPostUpdate and…
lynconsix Jan 7, 2025
efa866a
Fix
lynconsix Jan 8, 2025
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
2 changes: 1 addition & 1 deletion Client/game_sa/CObjectSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static void _declspec(naked) HOOK_CCObject_PreRender()
void CObjectSA::StaticSetHooks()
{
// Patch CObject::PreRender. We don't want the scaling code to execute
// We'll scale the object entity matrix after onClientPedsProcessed event
// We'll scale the object entity matrix after onClientPostUpdate event
// 5E - pop asi
// 83 C4 10 - add esp, 0x10
// C3 - ret
Expand Down
20 changes: 13 additions & 7 deletions Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())
g_pMultiplayer->SetChokingHandler(CClientGame::StaticChokingHandler);
g_pMultiplayer->SetPreWorldProcessHandler(CClientGame::StaticPreWorldProcessHandler);
g_pMultiplayer->SetPostWorldProcessHandler(CClientGame::StaticPostWorldProcessHandler);
g_pMultiplayer->SetPostWorldProcessPedsAfterPreRenderHandler(CClientGame::StaticPostWorldProcessPedsAfterPreRenderHandler);
g_pMultiplayer->SetPostWorldProcessEntitiesAfterPreRenderHandler(CClientGame::StaticPostWorldProcessEntitiesAfterPreRenderHandler);
g_pMultiplayer->SetPreFxRenderHandler(CClientGame::StaticPreFxRenderHandler);
g_pMultiplayer->SetPostColorFilterRenderHandler(CClientGame::StaticPostColorFilterRenderHandler);
g_pMultiplayer->SetPreHudRenderHandler(CClientGame::StaticPreHudRenderHandler);
Expand Down Expand Up @@ -484,7 +484,7 @@ CClientGame::~CClientGame()
g_pMultiplayer->SetChokingHandler(NULL);
g_pMultiplayer->SetPreWorldProcessHandler(NULL);
g_pMultiplayer->SetPostWorldProcessHandler(NULL);
g_pMultiplayer->SetPostWorldProcessPedsAfterPreRenderHandler(nullptr);
g_pMultiplayer->SetPostWorldProcessEntitiesAfterPreRenderHandler(nullptr);
g_pMultiplayer->SetPreFxRenderHandler(NULL);
g_pMultiplayer->SetPostColorFilterRenderHandler(nullptr);
g_pMultiplayer->SetPreHudRenderHandler(NULL);
Expand Down Expand Up @@ -2727,7 +2727,7 @@ void CClientGame::AddBuiltInEvents()

// Game events
m_Events.AddEvent("onClientPreRender", "", NULL, false);
m_Events.AddEvent("onClientPedsProcessed", "", NULL, false);
m_Events.AddEvent("onClientPostUpdate", "", NULL, false);
m_Events.AddEvent("onClientHUDRender", "", NULL, false);
m_Events.AddEvent("onClientRender", "", NULL, false);
m_Events.AddEvent("onClientMinimize", "", NULL, false);
Expand Down Expand Up @@ -3612,9 +3612,9 @@ void CClientGame::StaticPostWorldProcessHandler()
g_pClientGame->PostWorldProcessHandler();
}

void CClientGame::StaticPostWorldProcessPedsAfterPreRenderHandler()
void CClientGame::StaticPostWorldProcessEntitiesAfterPreRenderHandler()
{
g_pClientGame->PostWorldProcessPedsAfterPreRenderHandler();
g_pClientGame->PostWorldProcessEntitiesAfterPreRenderHandler();
}

void CClientGame::StaticPreFxRenderHandler()
Expand Down Expand Up @@ -3872,11 +3872,17 @@ void CClientGame::PostWorldProcessHandler()
m_pRootEntity->CallEvent("onClientPreRender", Arguments, false);
}

void CClientGame::PostWorldProcessPedsAfterPreRenderHandler()
void CClientGame::PostWorldProcessEntitiesAfterPreRenderHandler()
{
CLuaArguments Arguments;
m_pRootEntity->CallEvent("onClientPedsProcessed", Arguments, false);

if (m_pRootEntity->CallEvent("onClientPedsProcessed", Arguments, false))
{
CStaticFunctionDefinitions::AddEventHandler("onClientPedsProcessed", "onClientPostUpdate", "The 'onClientPedsProcessed' event is deprecated and has been renamed to 'onClientPostUpdate'.");
return;
}
Comment on lines +3879 to +3883
Copy link
Member

Choose a reason for hiding this comment

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

I don't know how you came up with the idea to put that here, remove it and adapt CStaticFunctionDefinitions::AddEventHandler.


m_pRootEntity->CallEvent("onClientPostUpdate", Arguments, false);
g_pClientGame->GetModelRenderer()->Update();
}

Expand Down
4 changes: 2 additions & 2 deletions Client/mods/deathmatch/logic/CClientGame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ class CClientGame
static bool StaticChokingHandler(unsigned char ucWeaponType);
static void StaticPreWorldProcessHandler();
static void StaticPostWorldProcessHandler();
static void StaticPostWorldProcessPedsAfterPreRenderHandler();
static void StaticPostWorldProcessEntitiesAfterPreRenderHandler();
static void StaticPreFxRenderHandler();
static void StaticPostColorFilterRenderHandler();
static void StaticPreHudRenderHandler();
Expand Down Expand Up @@ -573,7 +573,7 @@ class CClientGame
bool ChokingHandler(unsigned char ucWeaponType);
void PreWorldProcessHandler();
void PostWorldProcessHandler();
void PostWorldProcessPedsAfterPreRenderHandler();
void PostWorldProcessEntitiesAfterPreRenderHandler();
void CAnimBlendAssocDestructorHandler(CAnimBlendAssociationSAInterface* pThis);
CAnimBlendAssociationSAInterface* AddAnimationHandler(RpClump* pClump, AssocGroupId animGroup, AnimationId animID);
CAnimBlendAssociationSAInterface* AddAnimationAndSyncHandler(RpClump* pClump, CAnimBlendAssociationSAInterface* pAnimAssocToSyncWith,
Expand Down
70 changes: 35 additions & 35 deletions Client/multiplayer_sa/CMultiplayerSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,37 +388,37 @@ static const std::array<uint32_t, 16> shadowAddr{
0x73A48F // CWeapon::AddGunshell
};

PreContextSwitchHandler* m_pPreContextSwitchHandler = NULL;
PostContextSwitchHandler* m_pPostContextSwitchHandler = NULL;
PreWeaponFireHandler* m_pPreWeaponFireHandler = NULL;
PostWeaponFireHandler* m_pPostWeaponFireHandler = NULL;
BulletImpactHandler* m_pBulletImpactHandler = NULL;
BulletFireHandler* m_pBulletFireHandler = NULL;
DamageHandler* m_pDamageHandler = NULL;
DeathHandler* m_pDeathHandler = NULL;
FireHandler* m_pFireHandler = NULL;
ProjectileHandler* m_pProjectileHandler = NULL;
ProjectileStopHandler* m_pProjectileStopHandler = NULL;
ProcessCamHandler* m_pProcessCamHandler = NULL;
ChokingHandler* m_pChokingHandler = NULL;
ExplosionHandler* m_pExplosionHandler = NULL;
BreakTowLinkHandler* m_pBreakTowLinkHandler = NULL;
DrawRadarAreasHandler* m_pDrawRadarAreasHandler = NULL;
Render3DStuffHandler* m_pRender3DStuffHandler = NULL;
PreWorldProcessHandler* m_pPreWorldProcessHandler = NULL;
PostWorldProcessHandler* m_pPostWorldProcessHandler = NULL;
PostWorldProcessPedsAfterPreRenderHandler* m_postWorldProcessPedsAfterPreRenderHandler = nullptr;
IdleHandler* m_pIdleHandler = NULL;
PreFxRenderHandler* m_pPreFxRenderHandler = NULL;
PostColorFilterRenderHandler* m_pPostColorFilterRenderHandler = nullptr;
PreHudRenderHandler* m_pPreHudRenderHandler = NULL;
ProcessCollisionHandler* m_pProcessCollisionHandler = NULL;
HeliKillHandler* m_pHeliKillHandler = NULL;
ObjectDamageHandler* m_pObjectDamageHandler = NULL;
ObjectBreakHandler* m_pObjectBreakHandler = NULL;
FxSystemDestructionHandler* m_pFxSystemDestructionHandler = NULL;
DrivebyAnimationHandler* m_pDrivebyAnimationHandler = NULL;
AudioZoneRadioSwitchHandler* m_pAudioZoneRadioSwitchHandler = NULL;
PreContextSwitchHandler* m_pPreContextSwitchHandler = NULL;
PostContextSwitchHandler* m_pPostContextSwitchHandler = NULL;
PreWeaponFireHandler* m_pPreWeaponFireHandler = NULL;
PostWeaponFireHandler* m_pPostWeaponFireHandler = NULL;
BulletImpactHandler* m_pBulletImpactHandler = NULL;
BulletFireHandler* m_pBulletFireHandler = NULL;
DamageHandler* m_pDamageHandler = NULL;
DeathHandler* m_pDeathHandler = NULL;
FireHandler* m_pFireHandler = NULL;
ProjectileHandler* m_pProjectileHandler = NULL;
ProjectileStopHandler* m_pProjectileStopHandler = NULL;
ProcessCamHandler* m_pProcessCamHandler = NULL;
ChokingHandler* m_pChokingHandler = NULL;
ExplosionHandler* m_pExplosionHandler = NULL;
BreakTowLinkHandler* m_pBreakTowLinkHandler = NULL;
DrawRadarAreasHandler* m_pDrawRadarAreasHandler = NULL;
Render3DStuffHandler* m_pRender3DStuffHandler = NULL;
PreWorldProcessHandler* m_pPreWorldProcessHandler = NULL;
PostWorldProcessHandler* m_pPostWorldProcessHandler = NULL;
PostWorldProcessEntitiesAfterPreRenderHandler* m_postWorldProcessEntitiesAfterPreRenderHandler = nullptr;
IdleHandler* m_pIdleHandler = NULL;
PreFxRenderHandler* m_pPreFxRenderHandler = NULL;
PostColorFilterRenderHandler* m_pPostColorFilterRenderHandler = nullptr;
PreHudRenderHandler* m_pPreHudRenderHandler = NULL;
ProcessCollisionHandler* m_pProcessCollisionHandler = NULL;
HeliKillHandler* m_pHeliKillHandler = NULL;
ObjectDamageHandler* m_pObjectDamageHandler = NULL;
ObjectBreakHandler* m_pObjectBreakHandler = NULL;
FxSystemDestructionHandler* m_pFxSystemDestructionHandler = NULL;
DrivebyAnimationHandler* m_pDrivebyAnimationHandler = NULL;
AudioZoneRadioSwitchHandler* m_pAudioZoneRadioSwitchHandler = NULL;

CEntitySAInterface* dwSavedPlayerPointer = 0;
CEntitySAInterface* activeEntityForStreaming = 0; // the entity that the streaming system considers active
Expand Down Expand Up @@ -2647,9 +2647,9 @@ void CMultiplayerSA::SetPostWorldProcessHandler(PostWorldProcessHandler* pHandle
m_pPostWorldProcessHandler = pHandler;
}

void CMultiplayerSA::SetPostWorldProcessPedsAfterPreRenderHandler(PostWorldProcessPedsAfterPreRenderHandler* pHandler)
void CMultiplayerSA::SetPostWorldProcessEntitiesAfterPreRenderHandler(PostWorldProcessEntitiesAfterPreRenderHandler* pHandler)
{
m_postWorldProcessPedsAfterPreRenderHandler = pHandler;
m_postWorldProcessEntitiesAfterPreRenderHandler = pHandler;
}

void CMultiplayerSA::SetIdleHandler(IdleHandler* pHandler)
Expand Down Expand Up @@ -7258,8 +7258,8 @@ void _declspec(naked) HOOK_CTaskSimpleSwim_ProcessSwimmingResistance()

void PostCWorld_ProcessPedsAfterPreRender()
{
if (m_postWorldProcessPedsAfterPreRenderHandler)
m_postWorldProcessPedsAfterPreRenderHandler();
if (m_postWorldProcessEntitiesAfterPreRenderHandler)
m_postWorldProcessEntitiesAfterPreRenderHandler();

// Scale the object entities
CPools* pools = pGameInterface->GetPools();
Expand Down
2 changes: 1 addition & 1 deletion Client/multiplayer_sa/CMultiplayerSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class CMultiplayerSA : public CMultiplayer
void SetChokingHandler(ChokingHandler* pChokingHandler);
void SetPreWorldProcessHandler(PreWorldProcessHandler* pHandler);
void SetPostWorldProcessHandler(PostWorldProcessHandler* pHandler);
void SetPostWorldProcessPedsAfterPreRenderHandler(PostWorldProcessPedsAfterPreRenderHandler* pHandler);
void SetPostWorldProcessEntitiesAfterPreRenderHandler(PostWorldProcessEntitiesAfterPreRenderHandler* pHandler);
void SetIdleHandler(IdleHandler* pHandler);
void SetPreFxRenderHandler(PreFxRenderHandler* pHandler);
void SetPostColorFilterRenderHandler(PostColorFilterRenderHandler* pHandler) override;
Expand Down
4 changes: 2 additions & 2 deletions Client/sdk/multiplayer/CMultiplayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ typedef void(RenderHeliLightHandler)();
typedef bool(ChokingHandler)(unsigned char ucWeaponType);
typedef void(PreWorldProcessHandler)();
typedef void(PostWorldProcessHandler)();
typedef void(PostWorldProcessPedsAfterPreRenderHandler)();
typedef void(PostWorldProcessEntitiesAfterPreRenderHandler)();
typedef void(IdleHandler)();
typedef void(PreFxRenderHandler)();
typedef void(PostColorFilterRenderHandler)();
Expand Down Expand Up @@ -230,7 +230,7 @@ class CMultiplayer
virtual void SetProjectileStopHandler(ProjectileStopHandler* pProjectileHandler) = 0;
virtual void SetPreWorldProcessHandler(PreWorldProcessHandler* pHandler) = 0;
virtual void SetPostWorldProcessHandler(PostWorldProcessHandler* pHandler) = 0;
virtual void SetPostWorldProcessPedsAfterPreRenderHandler(PostWorldProcessPedsAfterPreRenderHandler* pHandler) = 0;
virtual void SetPostWorldProcessEntitiesAfterPreRenderHandler(PostWorldProcessEntitiesAfterPreRenderHandler* pHandler) = 0;
virtual void SetIdleHandler(IdleHandler* pHandler) = 0;
virtual void SetPreFxRenderHandler(PreFxRenderHandler* pHandler) = 0;
virtual void SetPostColorFilterRenderHandler(PostColorFilterRenderHandler* pHandler) = 0;
Expand Down