ALTV-545 add name to virtual entity group

altmp · Dec 26, 2024 · 6e27706 · 6e27706
1 parent 3d11ae5
commit 6e27706
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/c-api/core.cpp b/c-api/core.cpp
@@ -399,9 +399,9 @@ alt::IVirtualEntity* Core_CreateVirtualEntity(alt::ICore* core, alt::IVirtualEnt
     return virtualEntity;
 }
 
-alt::IVirtualEntityGroup* Core_CreateVirtualEntityGroup(alt::ICore* core, uint32_t maxEntitiesInStream, uint32_t &id)
+alt::IVirtualEntityGroup* Core_CreateVirtualEntityGroup(alt::ICore* core, const char* name, uint32_t maxEntitiesInStream, uint32_t &id)
 {
-    auto virtualEntityGroup = core->CreateVirtualEntityGroup(maxEntitiesInStream);
+    auto virtualEntityGroup = core->CreateVirtualEntityGroup(name, maxEntitiesInStream);
     if (virtualEntityGroup != nullptr) {
         id = virtualEntityGroup->GetID();
     }

diff --git a/c-api/core.h b/c-api/core.h
@@ -323,7 +323,7 @@ EXPORT_CLIENT alt::ILocalVehicle** Core_GetLocalVehicles(alt::ICore* core, uint3
 EXPORT_CLIENT void Core_GetPedBonePos(alt::ICore* core, int32_t scriptId, uint16_t boneId, vector3_t& pos);
 
 EXPORT_SHARED alt::IVirtualEntity* Core_CreateVirtualEntity(alt::ICore* core, alt::IVirtualEntityGroup* group, vector3_t position, uint32_t streamingDistance, const char* keys[], alt::MValueConst* values[], uint64_t size, uint32_t &id);
-EXPORT_SHARED alt::IVirtualEntityGroup* Core_CreateVirtualEntityGroup(alt::ICore* core, uint32_t maxEntitiesInStream, uint32_t &id);
+EXPORT_SHARED alt::IVirtualEntityGroup* Core_CreateVirtualEntityGroup(alt::ICore* core, const char* name, uint32_t maxEntitiesInStream, uint32_t &id);
 
 EXPORT_SHARED alt::IVirtualEntity** Core_GetVirtualEntities(alt::ICore* core, uint64_t& size);
 EXPORT_SHARED alt::IVirtualEntityGroup** Core_GetVirtualEntityGroups(alt::ICore* core, uint64_t& size);

diff --git a/c-api/entities/virtual_entitiy_group.cpp b/c-api/entities/virtual_entitiy_group.cpp
@@ -11,6 +11,11 @@ uint32_t VirtualEntityGroup_GetID(alt::IVirtualEntityGroup* virtualEntityGroup)
     return virtualEntityGroup->GetID();
 }
 
+const char* VirtualEntityGroup_GetName(alt::IVirtualEntityGroup* virtualEntityGroup, int32_t& size)
+{	
+	return AllocateString(virtualEntityGroup->GetName(), size);
+}
+
 uint32_t VirtualEntityGroup_GetMaxEntitiesInStream(alt::IVirtualEntityGroup* virtualEntityGroup)
 {
     return virtualEntityGroup->GetMaxEntitiesInStream();

diff --git a/c-api/entities/virtual_entitiy_group.h b/c-api/entities/virtual_entitiy_group.h
@@ -17,4 +17,5 @@
 EXPORT_SHARED alt::IBaseObject* VirtualEntityGroup_GetBaseObject(alt::IVirtualEntityGroup* virtualEntityGroup);
 
 EXPORT_SHARED uint32_t VirtualEntityGroup_GetID(alt::IVirtualEntityGroup* virtualEntityGroup);
+EXPORT_SHARED const char* VirtualEntityGroup_GetName(alt::IVirtualEntityGroup* virtualEntityGroup, int32_t& size);
 EXPORT_SHARED uint32_t VirtualEntityGroup_GetMaxEntitiesInStream(alt::IVirtualEntityGroup* virtualEntityGroup);
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 = 10075699596264467259UL;
+inline uint64_t capiHash = 2893565641794747425UL;
 inline uint64_t capiHashes[] = {
     0,
     #ifdef ALT_CLIENT_API
@@ -1093,7 +1093,7 @@ inline uint64_t capiHashes[] = {
     14147992496612914836UL,
     5009905671684942563UL,
     10333382199506434722UL,
-    17562251304729686304UL,
+    13211996744628084399UL,
     13221743936666214985UL,
     18388140590159782277UL,
     15661057563805869574UL,
@@ -1333,6 +1333,7 @@ inline uint64_t capiHashes[] = {
     9683760387923149316UL,
     6854495250887664593UL,
     3706424129225943778UL,
+    16807622528949935439UL,
     15809352227459172029UL,
     5853373970270474941UL,
     5926308654627541549UL,
@@ -3150,6 +3151,7 @@ inline void* capiPointers[] = {
     (void*) VirtualEntityGroup_GetBaseObject,
     (void*) VirtualEntityGroup_GetID,
     (void*) VirtualEntityGroup_GetMaxEntitiesInStream,
+    (void*) VirtualEntityGroup_GetName,
     (void*) VoiceChannel_GetID,
     (void*) WebSocketClient_GetID,
     (void*) WebView_GetID,