From cdd445684a8e0b9f8306d39b173be4a90fab6f91 Mon Sep 17 00:00:00 2001 From: doxoh Date: Thu, 2 Nov 2023 12:43:27 +0100 Subject: [PATCH] add event to PlayerRequestControlDelegate_t --- server/include/CSharpResourceImpl.h | 2 +- server/src/CSharpResourceImpl.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/include/CSharpResourceImpl.h b/server/include/CSharpResourceImpl.h index ca2fb60..b9cce08 100644 --- a/server/include/CSharpResourceImpl.h +++ b/server/include/CSharpResourceImpl.h @@ -165,7 +165,7 @@ typedef void (* ConnectionQueueRemoveDelegate_t)(alt::IConnectionInfo* connectio typedef void (* ServerStartedDelegate_t)(); -typedef void (* PlayerRequestControlDelegate_t)(void* target, alt::IBaseObject::Type targetBaseObjectType, alt::IPlayer* player); +typedef void (* PlayerRequestControlDelegate_t)(const alt::CEvent* event, void* target, alt::IBaseObject::Type targetBaseObjectType, alt::IPlayer* player); typedef void (* PlayerDimensionChangeDelegate_t)(alt::IPlayer* player, int32_t oldDimension, int32_t newDimension); diff --git a/server/src/CSharpResourceImpl.cpp b/server/src/CSharpResourceImpl.cpp index c652822..f88796e 100644 --- a/server/src/CSharpResourceImpl.cpp +++ b/server/src/CSharpResourceImpl.cpp @@ -53,7 +53,7 @@ void CSharpResourceImpl::ResetDelegates() OnConnectionQueueAddDelegate = [](auto var){}; OnConnectionQueueRemoveDelegate = [](auto var){}; OnServerStartedDelegate = []() {}; - OnPlayerRequestControlDelegate = [](auto var, auto var2, auto var3) {}; + OnPlayerRequestControlDelegate = [](auto var, auto var2, auto var3, auto var4) {}; OnPlayerDimensionChangeDelegate = [](auto var, auto var2, auto var3) {}; OnPlayerSpawnDelegate = [](auto var) {}; @@ -632,7 +632,8 @@ case alt::CEvent::Type::SYNCED_META_CHANGE: { auto playerRequestControlEvent = dynamic_cast(ev); auto targetPtr = GetEntityPointer(playerRequestControlEvent->GetTarget()); - OnPlayerRequestControlDelegate(targetPtr, + OnPlayerRequestControlDelegate(playerRequestControlEvent, + targetPtr, playerRequestControlEvent->GetTarget()->GetType(), playerRequestControlEvent->GetPlayer()); break;