Skip to content

Commit f3d94c7

Browse files
committed
add NPC C API functions and events
1 parent e5cfb76 commit f3d94c7

File tree

5 files changed

+213
-230
lines changed

5 files changed

+213
-230
lines changed

Server/Components/CAPI/Impl/ComponentManager.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "Vehicles/Events.hpp"
2121
#include "GangZones/Events.hpp"
2222
#include "CustomModels/Events.hpp"
23+
#include "NPCs/Events.hpp"
2324
#include "ComponentManager.hpp"
2425

2526
#define ADD_EVENT_HANDLER(component, event_instance) \
@@ -123,6 +124,7 @@ void ComponentManager::InitializeEvents()
123124
ADD_EVENT_HANDLER(console, ConsoleEvents);
124125
ADD_EVENT_HANDLER(gangzones, GangZoneEvents);
125126
ADD_EVENT_HANDLER(models, CustomModelsEvents);
127+
ADD_EVENT_HANDLER(npcs, NPCEvents);
126128

127129
ADD_PLAYER_EVENT_HANDLER(players, Spawn, PlayerEvents);
128130
ADD_PLAYER_EVENT_HANDLER(players, Connect, PlayerEvents);
@@ -151,6 +153,7 @@ void ComponentManager::FreeEvents()
151153
REMOVE_EVENT_HANDLER(console, ConsoleEvents);
152154
REMOVE_EVENT_HANDLER(gangzones, GangZoneEvents);
153155
REMOVE_EVENT_HANDLER(models, CustomModelsEvents);
156+
REMOVE_EVENT_HANDLER(npcs, NPCEvents);
154157

155158
REMOVE_PLAYER_EVENT_HANDLER(players, Spawn, PlayerEvents);
156159
REMOVE_PLAYER_EVENT_HANDLER(players, Connect, PlayerEvents);

Server/Components/CAPI/Impl/ComponentManager.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ inline PlayerDataType* GetPlayerData(IPlayer* player)
203203
}
204204

205205
/// Component check, return fail_ret if not available
206-
#define COMPONENT_CHECK_RET(pool, failret) \
207-
if (!ComponentManager::Get()->pool) \
208-
return failret; \
206+
#define COMPONENT_CHECK_RET(pool, failret) \
207+
if (!ComponentManager::Get()->pool) \
208+
return failret; \
209209
auto pool = ComponentManager::Get()->pool;
210210

211211
/// Cast object pointer to entity type, return fail_ret if not available

0 commit comments

Comments
 (0)