ALTV-364 add static property

altmp · Feb 7, 2025 · 75d3d5d · 75d3d5d
1 parent 59f5ca8
commit 75d3d5d
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,27 +11,27 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup .NET Core
         shell: pwsh
         run: |
           .\download_dotnet.ps1 ${{ runner.temp }} linux
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nethost-linux
           path: ${{ runner.temp }}/libnethost.tar
   fetch-nethost-windows:
     runs-on: windows-2022
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup .NET Core
         shell: pwsh
         run: |
           .\download_dotnet.ps1 ${{ runner.temp }} win
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nethost-windows
           path: ${{ runner.temp }}\libnethost.tar
@@ -58,10 +58,10 @@ jobs:
               nethost: nethost-windows,
             }
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.config.nethost }}
           path: ./nethost
@@ -105,18 +105,18 @@ jobs:
           filename=$(echo "${{ matrix.config.name }}")
           tar -cvf ./$filename.tar modules/$filename/modules
           echo "art_name=$filename" >> $GITHUB_OUTPUT
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: csharp-module-${{ matrix.config.name }}
           path: ./${{ steps.create_archive.outputs.art_name }}.tar
   build-client:
     runs-on: windows-latest
     needs: [fetch-nethost-linux, fetch-nethost-windows]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: nethost-windows
           path: ./nethost
@@ -152,7 +152,7 @@ jobs:
         run: |
           tar -cvf ./$filename.tar client/windows/client
           echo "art_name=$filename" >> $GITHUB_OUTPUT
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: client-windows
           path: ./${{ steps.create_archive.outputs.art_name }}.tar

diff --git a/c-api/cache/CachedEntity.h b/c-api/cache/CachedEntity.h
@@ -18,6 +18,7 @@ namespace cache
                                       _rotation(base->GetRotation()),
                                       _visible(base->GetVisible()),
                                       _frozen(base->IsFrozen()),
+                                      _staticEntity(base->IsStaticEntity()),
 #ifdef ALT_SERVER_API
                                       _streamed(base->GetStreamed()),
                                       _collision(base->HasCollision()),
@@ -136,6 +137,17 @@ namespace cache
         void SetFrozen(bool state) override
         {
         }
+
+        bool _staticEntity;
+
+        bool IsStaticEntity() const override
+        {
+            return _staticEntity;
+        }
+
+        void SetStaticEntity(bool state) override
+        {
+        }
 
 #ifdef ALT_SERVER_API
         void SetNetworkOwner(alt::IPlayer* player, bool disableMigration) override

diff --git a/c-api/core.cpp b/c-api/core.cpp
@@ -568,7 +568,7 @@ void Core_TriggerClientEventUnreliableForAll(alt::ICore* core, const char* ev, a
     core->TriggerClientEventUnreliableForAll(ev, mValues);
 }
 
-alt::IVehicle* Core_CreateVehicle(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint32_t &id) {
+alt::IVehicle* Core_CreateVehicle(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint8_t isStatic, uint32_t &id) {
     alt::Position position;
     position.x = pos.x;
     position.y = pos.y;
@@ -577,14 +577,14 @@ alt::IVehicle* Core_CreateVehicle(alt::ICore* core, uint32_t model, position_t p
     rotation.roll = rot.roll;
     rotation.pitch = rot.pitch;
     rotation.yaw = rot.yaw;
-    auto vehicle = core->CreateVehicle(model, position, rotation, streamingDistance);
+    auto vehicle = core->CreateVehicle(model, position, rotation, streamingDistance, isStatic);
     if (vehicle != nullptr) {
         id = vehicle->GetID();
     }
     return vehicle;
 }
 
-alt::IPed* Core_CreatePed(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint32_t &id)
+alt::IPed* Core_CreatePed(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint8_t isStatic, uint32_t &id)
 {
     alt::Position position;
     position.x = pos.x;
@@ -596,7 +596,7 @@ alt::IPed* Core_CreatePed(alt::ICore* core, uint32_t model, position_t pos, rota
     rotation.pitch = rot.pitch;
     rotation.yaw = rot.yaw;
 
-    auto ped = core->CreatePed(model, position, rotation, streamingDistance);
+    auto ped = core->CreatePed(model, position, rotation, streamingDistance, isStatic);
     if (ped != nullptr) {
         id = ped->GetID();
     }
@@ -859,7 +859,7 @@ alt::IMarker* Core_CreateMarker(alt::ICore* core, alt::IPlayer* target, uint8_t
 }
 
 alt::IObject* Core_CreateObject(alt::ICore* core, uint32_t model, position_t position, rotation_t rotation,
-    uint8_t alpha, uint8_t textureVariation, uint16_t lodDistance, uint32_t streamingDistance, uint32_t& id)
+    uint8_t alpha, uint8_t textureVariation, uint16_t lodDistance, uint32_t streamingDistance, uint8_t isStatic, uint32_t& id)
 {
     alt::Position pos;
     pos.x = position.x;
@@ -871,7 +871,7 @@ alt::IObject* Core_CreateObject(alt::ICore* core, uint32_t model, position_t pos
     rot.pitch = rotation.pitch;
     rot.yaw = rotation.yaw;
 
-    auto networkObject = core->CreateObject(model, pos, rot, alpha, textureVariation, lodDistance, streamingDistance);
+    auto networkObject = core->CreateObject(model, pos, rot, alpha, textureVariation, lodDistance, streamingDistance, isStatic);
     if (networkObject != nullptr) {
         id = networkObject->GetID();
     }

diff --git a/c-api/core.h b/c-api/core.h
@@ -92,8 +92,8 @@ EXPORT_SERVER void Core_TriggerClientEventUnreliable(alt::ICore* core, alt::IPla
 EXPORT_SERVER void Core_TriggerClientEventUnreliableForSome(alt::ICore* core, alt::IPlayer* targets[], int targetsSize, const char* ev, alt::MValueConst* args[], int argsSize);
 EXPORT_SERVER void Core_TriggerClientEventUnreliableForAll(alt::ICore* core, const char* ev, alt::MValueConst* args[], int size);
 
-EXPORT_SERVER alt::IVehicle* Core_CreateVehicle(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint32_t &id);
-EXPORT_SERVER alt::IPed* Core_CreatePed(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint32_t &id);
+EXPORT_SERVER alt::IVehicle* Core_CreateVehicle(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint8_t isStatic, uint32_t &id);
+EXPORT_SERVER alt::IPed* Core_CreatePed(alt::ICore* core, uint32_t model, position_t pos, rotation_t rot, uint32_t streamingDistance, uint8_t isStatic, uint32_t &id);
 #ifdef ALT_SERVER_API
 EXPORT_SERVER alt::ICheckpoint* Core_CreateCheckpoint(alt::ICore* core, uint8_t type, position_t pos, float radius, float height, rgba_t color, uint32_t streamingDistance, uint32_t &id);
 #endif
@@ -353,7 +353,7 @@ EXPORT_CLIENT alt::IFont* Core_RegisterFont(alt::ICore* core, alt::IResource* re
 
 EXPORT_CLIENT uint8_t Core_IsFullScreen(alt::ICore* core);
 
-EXPORT_SERVER alt::IObject* Core_CreateObject(alt::ICore* core, uint32_t model, position_t position, rotation_t rotation, uint8_t alpha, uint8_t textureVariation, uint16_t lodDistance, uint32_t streamingDistance, uint32_t& id);
+EXPORT_SERVER alt::IObject* Core_CreateObject(alt::ICore* core, uint32_t model, position_t position, rotation_t rotation, uint8_t alpha, uint8_t textureVariation, uint16_t lodDistance, uint32_t streamingDistance, uint8_t isStatic, uint32_t& id);
 
 EXPORT_SERVER alt::Metric* Core_RegisterMetric(alt::ICore* core, const char* metricName, uint8_t type, const char* keys[], const char* values[], uint64_t size);
 EXPORT_SERVER void Core_UnregisterMetric(alt::ICore* core, alt::Metric* metric);

diff --git a/c-api/entities/entity.cpp b/c-api/entities/entity.cpp
@@ -64,6 +64,11 @@ void Entity_SetFrozen(alt::IEntity* entity, uint8_t state) {
     entity->SetFrozen(state);
 }
 
+uint8_t Entity_IsStaticEntity(alt::IEntity* entity)
+{
+    return entity->IsStaticEntity();
+}
+
 #ifdef ALT_SERVER_API
 void Entity_SetNetOwner(alt::IEntity* entity, alt::IPlayer* networkOwnerPlayer, uint8_t disableMigration) {
     entity->SetNetworkOwner(networkOwnerPlayer, disableMigration);
@@ -150,6 +155,11 @@ void Entity_SetStreamingDistance(alt::IEntity* entity, uint32_t streamingDistanc
 {
     entity->SetStreamingDistance(streamingDistance);
 }
+
+void Entity_SetStaticEntity(alt::IEntity* entity, uint8_t state)
+{
+    entity->SetStaticEntity(state);
+}
 #endif
 
 #ifdef ALT_CLIENT_API

diff --git a/c-api/entities/entity.h b/c-api/entities/entity.h
@@ -57,3 +57,6 @@ EXPORT_SERVER uint32_t Entity_GetTimestamp(alt::IEntity* entity);
 
 EXPORT_SERVER uint32_t Entity_GetStreamingDistance(alt::IEntity* entity);
 EXPORT_SERVER void Entity_SetStreamingDistance(alt::IEntity* entity, uint32_t streamingDistance);
+
+EXPORT_SHARED uint8_t Entity_IsStaticEntity(alt::IEntity* entity);
+EXPORT_SERVER void Entity_SetStaticEntity(alt::IEntity* entity, uint8_t state);
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 = 1842878650442980314UL;
+inline uint64_t capiHash = 3321255477537537411UL;
 inline uint64_t capiHashes[] = {
     0,
     #ifdef ALT_CLIENT_API
@@ -1132,6 +1132,7 @@ inline uint64_t capiHashes[] = {
     15286200049861980882UL,
     2664435930066837893UL,
     7430146286071665147UL,
+    14301521857243827244UL,
     2663061204279682928UL,
     7991844148745066430UL,
     11148172387419141388UL,
@@ -1388,9 +1389,9 @@ inline uint64_t capiHashes[] = {
     6946126881626778655UL,
     3410920088129362997UL,
     9200413248217250533UL,
-    6778852446992337891UL,
-    16295351054968805916UL,
-    494948204560226296UL,
+    18049638355733736363UL,
+    5701654053984961760UL,
+    12711263914629824012UL,
     16510685691058823138UL,
     7933678493039322900UL,
     11272860948152964480UL,
@@ -1472,6 +1473,7 @@ inline uint64_t capiHashes[] = {
     10673322505892191972UL,
     5985306302153035853UL,
     6937824812303569788UL,
+    14961071524798922101UL,
     6004628797499736605UL,
     13173445283048314724UL,
     12798418058428333585UL,
@@ -2954,6 +2956,7 @@ inline void* capiPointers[] = {
     (void*) Entity_GetWorldObject,
     (void*) Entity_HasStreamSyncedMetaData,
     (void*) Entity_IsFrozen,
+    (void*) Entity_IsStaticEntity,
     (void*) Entity_SetFrozen,
     (void*) Entity_SetRotation,
     (void*) Event_Cancel,
@@ -3294,6 +3297,7 @@ inline void* capiPointers[] = {
     (void*) Entity_SetCollision,
     (void*) Entity_SetMultipleStreamSyncedMetaData,
     (void*) Entity_SetNetOwner,
+    (void*) Entity_SetStaticEntity,
     (void*) Entity_SetStreamed,
     (void*) Entity_SetStreamingDistance,
     (void*) Entity_SetStreamSyncedMetaData,

diff --git a/cpp-sdk b/cpp-sdk
+3 −3		ICore.h
+3 −0		events/CVoiceConnectionEvent.h
+4 −0		objects/IEntity.h