Skip to content

Commit

Permalink
fix(client): change types for local entites
Browse files Browse the repository at this point in the history
  • Loading branch information
@Doxoh
Doxoh committed Mar 26, 2024
1 parent 7462fdd commit 429df48
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 26 deletions.
42 changes: 25 additions & 17 deletions client/src/runtime/CSharpResourceImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
auto playerEnterVehicleEvent = dynamic_cast<const alt::CPlayerEnterVehicleEvent*>(ev);
auto target = playerEnterVehicleEvent->GetTarget();
OnPlayerEnterVehicleDelegate(Util_GetBaseObjectPointer(target),
static_cast<uint8_t>(target->GetType()),
target->GetType(),
playerEnterVehicleEvent->GetSeat());
break;
}
Expand All @@ -176,22 +176,26 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
auto playerLeaveVehicleEvent = dynamic_cast<const alt::CPlayerLeaveVehicleEvent*>(ev);
auto target = playerLeaveVehicleEvent->GetTarget();
OnPlayerLeaveVehicleDelegate(Util_GetBaseObjectPointer(target),
static_cast<uint8_t>(target->GetType()),
target->GetType(),
playerLeaveVehicleEvent->GetSeat());
break;
}
case alt::CEvent::Type::PLAYER_CHANGE_VEHICLE_SEAT:
{
auto playerChangeVehicleSeatEvent = dynamic_cast<const alt::CPlayerChangeVehicleSeatEvent*>(ev);
OnPlayerChangeVehicleSeatDelegate(playerChangeVehicleSeatEvent->GetTarget(),
auto target = playerChangeVehicleSeatEvent->GetTarget();
OnPlayerChangeVehicleSeatDelegate(Util_GetBaseObjectPointer(target),
target->GetType(),
playerChangeVehicleSeatEvent->GetOldSeat(),
playerChangeVehicleSeatEvent->GetNewSeat());
break;
}
case alt::CEvent::Type::PLAYER_CHANGE_ANIMATION_EVENT:
{
auto playerAnimationChangeEvent = dynamic_cast<const alt::CPlayerChangeAnimationEvent*>(ev);
OnPlayerChangeAnimationDelegate(playerAnimationChangeEvent->GetTarget(),
auto target = playerAnimationChangeEvent->GetTarget();
OnPlayerChangeAnimationDelegate(Util_GetBaseObjectPointer(target),
target->GetType(),
playerAnimationChangeEvent->GetOldAnimationDict(),
playerAnimationChangeEvent->GetNewAnimationDict(),
playerAnimationChangeEvent->GetOldAnimationName(),
Expand All @@ -203,7 +207,9 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
auto playerChangeInteriorEvent = dynamic_cast<const alt::CPlayerChangeInteriorEvent*>(ev);
auto oldInteriorLocation = playerChangeInteriorEvent->GetOldInteriorLocation();
auto newInteriorLocation = playerChangeInteriorEvent->GetNewInteriorLocation();
OnPlayerChangeInteriorDelegate(playerChangeInteriorEvent->GetTarget(),
auto target = playerChangeInteriorEvent->GetTarget();
OnPlayerChangeInteriorDelegate(Util_GetBaseObjectPointer(target),
target->GetType(),
oldInteriorLocation,
newInteriorLocation);
break;
Expand Down Expand Up @@ -274,20 +280,18 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
{
auto gameEntityCreateEvent = dynamic_cast<const alt::CGameEntityCreateEvent*>(ev);
auto entity = gameEntityCreateEvent->GetTarget();
auto type = static_cast<uint8_t>(entity->GetType());

OnGameEntityCreateDelegate(Util_GetEntityPointer(entity),
type);
entity->GetType());
break;
}
case alt::CEvent::Type::GAME_ENTITY_DESTROY:
{
auto gameEntityDestroyEvent = dynamic_cast<const alt::CGameEntityDestroyEvent*>(ev);
auto entity = gameEntityDestroyEvent->GetTarget();
auto type = static_cast<uint8_t>(entity->GetType());

OnGameEntityDestroyDelegate(Util_GetEntityPointer(entity),
type);
entity->GetType());
break;
}
#pragma endregion
Expand Down Expand Up @@ -501,7 +505,9 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
auto playerPointer = Util_GetEntityPointer(player);

OnPlayerStartEnterVehicleDelegate(targetPointer,
target->GetType(),
playerPointer,
player->GetType(),
playerStartEnterVehicleEvent->GetSeat());
break;
}
Expand All @@ -515,7 +521,9 @@ void CSharpResourceImpl::OnEvent(const alt::CEvent* ev)
auto playerPointer = Util_GetEntityPointer(player);

OnPlayerStartLeaveVehicleDelegate(targetPointer,
target->GetType(),
playerPointer,
player->GetType(),
playerStartLeaveVehicleEvent->GetSeat());
break;
}
Expand Down Expand Up @@ -945,8 +953,8 @@ void CSharpResourceImpl::ResetDelegates() {
OnRmlEventDelegate = [](auto var, auto var2, auto var3) {};
OnAudioEventDelegate = [](auto var, auto var2, auto var3, auto var4) {};

OnPlayerSpawnDelegate = [](){};
OnPlayerDisconnectDelegate = [](){};
OnPlayerSpawnDelegate = []{};
OnPlayerDisconnectDelegate = []{};
OnPlayerEnterVehicleDelegate = [](auto var, auto var2, auto var3) {};
OnPlayerLeaveVehicleDelegate = [](auto var, auto var2, auto var3) {};

Expand All @@ -960,11 +968,11 @@ void CSharpResourceImpl::ResetDelegates() {
OnKeyUpDelegate = [](auto var) {};
OnKeyDownDelegate = [](auto var) {};

OnPlayerChangeVehicleSeatDelegate = [](auto var, auto var2, auto var3) {};
OnPlayerChangeAnimationDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5) {};
OnPlayerChangeInteriorDelegate = [](auto var, auto var2, auto var3) {};
OnPlayerChangeVehicleSeatDelegate = [](auto var, auto var2, auto var3, auto var4) {};
OnPlayerChangeAnimationDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5, auto var6) {};
OnPlayerChangeInteriorDelegate = [](auto var, auto var2, auto var3, auto var4) {};

OnConnectionCompleteDelegate = []() {};
OnConnectionCompleteDelegate = []{};

OnGlobalMetaChangeDelegate = [](auto var, auto var2, auto var3) {};
OnGlobalSyncedMetaChangeDelegate = [](auto var, auto var2, auto var3) {};
Expand Down Expand Up @@ -998,8 +1006,8 @@ void CSharpResourceImpl::ResetDelegates() {

OnEntityHitEntityDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5) {};

OnPlayerStartEnterVehicleDelegate = [](auto var, auto var2, auto var3) {};
OnPlayerStartLeaveVehicleDelegate = [](auto var, auto var2, auto var3) {};
OnPlayerStartEnterVehicleDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5) {};
OnPlayerStartLeaveVehicleDelegate = [](auto var, auto var2, auto var3, auto var4, auto var5) {};

OnPlayerBulletHitDelegate = [](auto var, auto var2, auto var3, auto var4) {};

Expand Down
18 changes: 9 additions & 9 deletions client/src/runtime/eventDelegates.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ typedef void (* AudioEventDelegate_t)(alt::IAudio*, const char* name, alt::MValu

typedef void (* PlayerSpawnDelegate_t)();
typedef void (* PlayerDisconnectDelegate_t)();
typedef void (* PlayerEnterVehicleDelegate_t)(void*, uint8_t type, uint8_t seat);
typedef void (* PlayerLeaveVehicleDelegate_t)(void*, uint8_t type, uint8_t seat);
typedef void (* PlayerEnterVehicleDelegate_t)(void* vehicle, alt::IBaseObject::Type type, uint8_t seat);
typedef void (* PlayerLeaveVehicleDelegate_t)(void* vehicle, alt::IBaseObject::Type type, uint8_t seat);

typedef void (* GameEntityCreateDelegate_t)(void*, uint8_t type);
typedef void (* GameEntityDestroyDelegate_t)(void*, uint8_t type);
typedef void (* GameEntityCreateDelegate_t)(void* entity, alt::IBaseObject::Type type);
typedef void (* GameEntityDestroyDelegate_t)(void* entity, alt::IBaseObject::Type type);

typedef void (* AnyResourceErrorDelegate_t)(const char* name);
typedef void (* AnyResourceStartDelegate_t)(const char* name);
Expand All @@ -26,9 +26,9 @@ typedef void (* AnyResourceStopDelegate_t)(const char* name);
typedef void (* KeyUpDelegate_t)(uint32_t key);
typedef void (* KeyDownDelegate_t)(uint32_t key);

typedef void (* PlayerChangeVehicleSeatDelegate_t)(alt::IVehicle*, uint8_t oldSeat, uint8_t newSeat);
typedef void (* PlayerChangeAnimationDelegate_t)(alt::IPlayer* player, uint32_t oldDict, uint32_t newDict, uint32_t oldName, uint32_t newName);
typedef void (* PlayerChangeInteriorDelegate_t)(alt::IPlayer* player, uint32_t oldIntLoc, uint32_t newIntLoc);
typedef void (* PlayerChangeVehicleSeatDelegate_t)(void* vehicle, alt::IBaseObject::Type type, uint8_t oldSeat, uint8_t newSeat);
typedef void (* PlayerChangeAnimationDelegate_t)(void* player, alt::IBaseObject::Type playerType, uint32_t oldDict, uint32_t newDict, uint32_t oldName, uint32_t newName);
typedef void (* PlayerChangeInteriorDelegate_t)(void* player, alt::IBaseObject::Type playerType, uint32_t oldIntLoc, uint32_t newIntLoc);

typedef void (* ConnectionCompleteDelegate_t)();

Expand Down Expand Up @@ -71,8 +71,8 @@ typedef void (* ColShapeDelegate_t)(alt::IColShape* colShape, void* entity, alt:

typedef void (* EntityHitEntityDelegate_t)(void* target, alt::IBaseObject::Type targetType, void* damager, alt::IBaseObject::Type damagerType, uint32_t weaponHash);

typedef void (* PlayerStartEnterVehicleDelegate_t)(void* target, void* player, uint8_t seat);
typedef void (* PlayerStartLeaveVehicleDelegate_t)(void* target, void* player, uint8_t seat);
typedef void (* PlayerStartEnterVehicleDelegate_t)(void* target, alt::IBaseObject::Type targetType, void* player, alt::IBaseObject::Type playerType, uint8_t seat);
typedef void (* PlayerStartLeaveVehicleDelegate_t)(void* target, alt::IBaseObject::Type targetType, void* player, alt::IBaseObject::Type playerType, uint8_t seat);

typedef void (* PlayerBulletHitDelegate_t)(uint32_t weapon, void* victim, alt::IBaseObject::Type victimType, position_t pos);

Expand Down

0 comments on commit 429df48

Please sign in to comment.