ALTV-640 add parachuteStateChange Event

altmp · Jan 18, 2025 · 45d1019 · 45d1019
1 parent a6f3067
commit 45d1019
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/c-api/event.cpp b/c-api/event.cpp
@@ -115,6 +115,8 @@ SetDelegate(ScriptRPCAnswer)
 
 SetDelegate(PlayerDimensionChange)
 
+SetDelegate(ParachuteStateChange)
+
 #endif
 
 CAPI_END()
diff --git a/c-api/event.h b/c-api/event.h
@@ -99,4 +99,6 @@ EXPORT_CLIENT void Event_SetScriptRPCDelegate(CSharpResourceImpl* resource, /**
 EXPORT_CLIENT void Event_SetScriptRPCAnswerDelegate(CSharpResourceImpl* resource, /** ClientEvents.ScriptRPCAnswerModuleDelegate */ ScriptRPCAnswerDelegate_t delegate);
 
 EXPORT_CLIENT void Event_SetPlayerDimensionChangeDelegate(CSharpResourceImpl* resource, /** ClientEvents.PlayerDimensionChangeModuleDelegate */ PlayerDimensionChangeDelegate_t delegate);
+
+EXPORT_CLIENT void Event_SetParachuteStateChangeDelegate(CSharpResourceImpl* resource, /** ClientEvents.ParachuteStateChangeModuleDelegate */ ParachuteStateChangeDelegate_t delegate);
 #endif
diff --git a/c-api/func_table.cpp b/c-api/func_table.cpp
@@ -1,6 +1,6 @@
 #include "func_table.h"
 
-inline uint64_t capiHash = 14533172368099836198UL;
+inline uint64_t capiHash = 93234109882736831UL;
 inline uint64_t capiHashes[] = {
     0,
     #ifdef ALT_CLIENT_API
@@ -289,6 +289,7 @@ inline uint64_t capiHashes[] = {
     1555813148561817401UL,
     10052271841742065911UL,
     15651483423859541657UL,
+    11234135878852629737UL,
     17879780001793566297UL,
     1013031841840963141UL,
     10641081887455190199UL,
@@ -2111,6 +2112,7 @@ inline void* capiPointers[] = {
     (void*) Event_SetLocalMetaChangeDelegate,
     (void*) Event_SetMetaChangeDelegate,
     (void*) Event_SetNetOwnerChangeDelegate,
+    (void*) Event_SetParachuteStateChangeDelegate,
     (void*) Event_SetPlayerBulletHitDelegate,
     (void*) Event_SetPlayerChangeAnimationDelegate,
     (void*) Event_SetPlayerChangeInteriorDelegate,

diff --git a/client/src/runtime/CSharpResourceImpl.cpp b/client/src/runtime/CSharpResourceImpl.cpp
@@ -598,6 +598,16 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
                                            playerDimensionChangeEvent->GetNewDimension());
             break;
         }
+    case alt::CEvent::Type::PARACHUTE_STATE_CHANGE:
+        {
+            auto parachuteStateChangeEvent = dynamic_cast<const alt::CParachuteStateChangeEvent*>(ev);
+
+            OnParachuteStateChangeDelegate(Util_GetBaseObjectPointer(parachuteStateChangeEvent->GetPlayer()),
+                                           parachuteStateChangeEvent->GetPlayer()->GetType(),
+                                           parachuteStateChangeEvent->GetOldState(),
+                                           parachuteStateChangeEvent->GetNewState());
+            break;
+        }
     default:
         {
             std::cout << "Unhandled client event #" << static_cast<int>(ev->GetType()) << " got called" << std::endl;
@@ -1023,4 +1033,6 @@ void CSharpResourceImpl::ResetDelegates() {
     OnScriptRPCAnswerDelegate = [](auto var, auto var2, auto var3) {};
 
     OnPlayerDimensionChangeDelegate = [](auto var, auto var2, auto var3, auto var4) {};
+
+    OnParachuteStateChangeDelegate = [](auto var, auto var2, auto var3, auto var4) {};
 }
diff --git a/client/src/runtime/CSharpResourceImpl.h b/client/src/runtime/CSharpResourceImpl.h
@@ -107,6 +107,8 @@ class CSharpResourceImpl : public alt::IResource::Impl
 
     PlayerDimensionChangeDelegate_t OnPlayerDimensionChangeDelegate = nullptr;
 
+    ParachuteStateChangeDelegate_t OnParachuteStateChangeDelegate = nullptr;
+
 
     bool MakeClient(alt::IResource::CreationInfo* info, std::vector<std::string> files)
     {

diff --git a/client/src/runtime/eventDelegates.h b/client/src/runtime/eventDelegates.h
@@ -81,3 +81,7 @@ typedef void (* ScriptRPCDelegate_t)(const alt::CEvent* event, const char* name,
 typedef void (* ScriptRPCAnswerDelegate_t)(uint16_t answerId, alt::MValueConst* answer, const char* answerError);
 
 typedef void (* PlayerDimensionChangeDelegate_t)(void* target, alt::IBaseObject::Type targetBaseObjectType, int32_t oldDim, int32_t newDim);
+
+typedef void (* ParachuteStateChangeDelegate_t)(void* player, alt::IBaseObject::Type playerType, alt::CParachuteStateChangeEvent::ParachuteState oldState, alt::CParachuteStateChangeEvent::ParachuteState newState);
+
+
diff --git a/cpp-sdk b/cpp-sdk
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,8 @@ class CSharpResourceImpl : public alt::IResource::Impl @@
         PlayerDimensionChangeDelegate_t OnPlayerDimensionChangeDelegate = nullptr;
+        ParachuteStateChangeDelegate_t OnParachuteStateChangeDelegate = nullptr;
         bool MakeClient(alt::IResource::CreationInfo* info, std::vector<std::string> files)
         {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,3 +81,7 @@ typedef void (* ScriptRPCDelegate_t)(const alt::CEvent* event, const char* name,
		typedef void (* ScriptRPCAnswerDelegate_t)(uint16_t answerId, alt::MValueConst* answer, const char* answerError);

		typedef void (* PlayerDimensionChangeDelegate_t)(void* target, alt::IBaseObject::Type targetBaseObjectType, int32_t oldDim, int32_t newDim);

		typedef void (* ParachuteStateChangeDelegate_t)(void* player, alt::IBaseObject::Type playerType, alt::CParachuteStateChangeEvent::ParachuteState oldState, alt::CParachuteStateChangeEvent::ParachuteState newState);
+1 −0		SDK.h
+2 −0		events/CEvent.h
+38 −0		events/CParachuteStateChangeEvent.h