Skip to content

Commit c4e9a1c

Browse files
FabianTerhorstFabianTerhorst
committed
update cpp sdk
1 parent c426146 commit c4e9a1c

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎api/AltV.Net/Native/AltV.Server.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,6 @@ internal static extern IntPtr Server_CreateBlip(IntPtr serverPointer, IntPtr pla
5252
internal static extern IntPtr Server_CreateBlipAttached(IntPtr serverPointer, IntPtr playerTargetPointer,
5353
byte type, IntPtr entityAttachPointer);
5454

55-
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
56-
internal static extern void Server_RemoveEntity(IntPtr serverPointer, IntPtr entityPointer);
57-
58-
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
59-
internal static extern void Server_RemoveBlip(IntPtr serverPointer, IntPtr blipPointer);
60-
61-
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
62-
internal static extern void Server_RemoveCheckpoint(IntPtr serverPointer, IntPtr checkpointPointer);
63-
64-
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
65-
internal static extern void Server_RemoveVehicle(IntPtr serverPointer, IntPtr vehiclePointer);
66-
6755
[DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
6856
internal static extern void Server_GetResource(IntPtr serverPointer, string resourceName,
6957
ref IntPtr resourcePointer);
@@ -72,8 +60,20 @@ internal static extern void Server_GetResource(IntPtr serverPointer, string reso
7260
internal static extern IntPtr Server_CreateVoiceChannel(IntPtr serverPointer, bool spatial,
7361
float maxDistance);
7462

75-
[DllImport(DllName, CharSet = CharSet.Ansi, CallingConvention = NativeCallingConvention)]
76-
internal static extern void Server_RemoveVoiceChannel(IntPtr serverPointer, IntPtr channelPointer);
63+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
64+
internal static extern void Server_DestroyBaseObject(IntPtr serverPointer, IntPtr baseObjectPointer);
65+
66+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
67+
internal static extern void Server_DestroyVehicle(IntPtr serverPointer, IntPtr baseObjectPointer);
68+
69+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
70+
internal static extern void Server_DestroyBlip(IntPtr serverPointer, IntPtr baseObjectPointer);
71+
72+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
73+
internal static extern void Server_DestroyCheckpoint(IntPtr serverPointer, IntPtr baseObjectPointer);
74+
75+
[DllImport(DllName, CallingConvention = NativeCallingConvention)]
76+
internal static extern void Server_DestroyVoiceChannel(IntPtr serverPointer, IntPtr baseObjectPointer);
7777
}
7878
}
7979
}

‎api/AltV.Net/Server.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,31 +255,31 @@ public void RemoveBlip(IBlip blip)
255255
{
256256
if (blip.Exists)
257257
{
258-
AltNative.Server.Server_RemoveBlip(NativePointer, blip.NativePointer);
258+
AltNative.Server.Server_DestroyBlip(NativePointer, blip.NativePointer);
259259
}
260260
}
261261

262262
public void RemoveCheckpoint(ICheckpoint checkpoint)
263263
{
264264
if (checkpoint.Exists)
265265
{
266-
AltNative.Server.Server_RemoveCheckpoint(NativePointer, checkpoint.NativePointer);
266+
AltNative.Server.Server_DestroyCheckpoint(NativePointer, checkpoint.NativePointer);
267267
}
268268
}
269269

270270
public void RemoveVehicle(IVehicle vehicle)
271271
{
272272
if (vehicle.Exists)
273273
{
274-
AltNative.Server.Server_RemoveVehicle(NativePointer, vehicle.NativePointer);
274+
AltNative.Server.Server_DestroyVehicle(NativePointer, vehicle.NativePointer);
275275
}
276276
}
277277

278278
public void RemoveVoiceChannel(IVoiceChannel channel)
279279
{
280280
if (channel.Exists)
281281
{
282-
AltNative.Server.Server_RemoveVoiceChannel(NativePointer, channel.NativePointer);
282+
AltNative.Server.Server_DestroyVoiceChannel(NativePointer, channel.NativePointer);
283283
}
284284
}
285285

‎runtime/src/altv-c-api/server.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,30 @@ Server_CreateBlipAttached(alt::IServer* server, alt::IPlayer* target, uint8_t ty
7070
return server->CreateBlip(target, (alt::IBlip::Type) type, attachTo);
7171
}
7272

73-
void Server_RemoveEntity(alt::IServer* server, alt::IEntity* entity) {
74-
return server->RemoveEntity(entity);
73+
void Server_GetResource(alt::IServer* server, const char* resourceName, alt::IResource*&resource) {
74+
resource = server->GetResource(resourceName);
7575
}
7676

77-
void Server_RemoveBlip(alt::IServer* server, alt::IBlip* blip) {
78-
server->RemoveBlip(blip);
77+
alt::IVoiceChannel* Server_CreateVoiceChannel(alt::IServer* server, bool spatial, float maxDistance) {
78+
return server->CreateVoiceChannel(spatial, maxDistance);
7979
}
8080

81-
void Server_RemoveCheckpoint(alt::IServer* server, alt::ICheckpoint* checkpoint) {
82-
server->RemoveCheckpoint(checkpoint);
81+
void Server_DestroyBaseObject(alt::IServer* server, alt::IBaseObject* baseObject) {
82+
return server->DestroyBaseObject(baseObject);
8383
}
8484

85-
void Server_RemoveVehicle(alt::IServer* server, alt::IVehicle* vehicle) {
86-
server->RemoveEntity(vehicle);
85+
void Server_DestroyVehicle(alt::IServer* server, alt::IVehicle* baseObject) {
86+
return server->DestroyBaseObject(baseObject);
8787
}
8888

89-
void Server_GetResource(alt::IServer* server, const char* resourceName, alt::IResource*&resource) {
90-
resource = server->GetResource(resourceName);
89+
void Server_DestroyBlip(alt::IServer* server, alt::IBlip* baseObject) {
90+
return server->DestroyBaseObject(baseObject);
9191
}
9292

93-
alt::IVoiceChannel* Server_CreateVoiceChannel(alt::IServer* server, bool spatial, float maxDistance) {
94-
return server->CreateVoiceChannel(spatial, maxDistance);
93+
void Server_DestroyCheckpoint(alt::IServer* server, alt::ICheckpoint* baseObject) {
94+
return server->DestroyBaseObject(baseObject);
9595
}
9696

97-
void Server_RemoveVoiceChannel(alt::IServer* server, alt::IVoiceChannel* channel) {
98-
return server->RemoveVoiceChannel(channel);
99-
}
97+
void Server_DestroyVoiceChannel(alt::IServer* server, alt::IVoiceChannel* baseObject) {
98+
return server->DestroyBaseObject(baseObject);
99+
}

‎runtime/src/altv-c-api/server.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ EXPORT alt::IBlip*
3737
Server_CreateBlip(alt::IServer* server, alt::IPlayer* target, uint8_t type, alt::Position pos);
3838
EXPORT alt::IBlip*
3939
Server_CreateBlipAttached(alt::IServer* server, alt::IPlayer* target, uint8_t type, alt::IEntity* attachTo);
40-
EXPORT void Server_RemoveEntity(alt::IServer* server, alt::IEntity* entity);
41-
EXPORT void Server_RemoveBlip(alt::IServer* server, alt::IBlip* blip);
42-
EXPORT void Server_RemoveCheckpoint(alt::IServer* server, alt::ICheckpoint* checkpoint);
43-
EXPORT void Server_RemoveVehicle(alt::IServer* server, alt::IVehicle* vehicle);
4440
EXPORT void Server_GetResource(alt::IServer* server, const char* resourceName, alt::IResource*&resource);
4541
EXPORT alt::IVoiceChannel* Server_CreateVoiceChannel(alt::IServer* server, bool spatial, float maxDistance);
46-
EXPORT void Server_RemoveVoiceChannel(alt::IServer* server, alt::IVoiceChannel* channel);
42+
EXPORT void Server_DestroyBaseObject(alt::IServer* server, alt::IBaseObject* baseObject);
43+
EXPORT void Server_DestroyVehicle(alt::IServer* server, alt::IVehicle* baseObject);
44+
EXPORT void Server_DestroyBlip(alt::IServer* server, alt::IBlip* baseObject);
45+
EXPORT void Server_DestroyCheckpoint(alt::IServer* server, alt::ICheckpoint* baseObject);
46+
EXPORT void Server_DestroyVoiceChannel(alt::IServer* server, alt::IVoiceChannel* baseObject);
4747
#ifdef __cplusplus
4848
}
4949
#endif

‎runtime/thirdparty/altv-cpp-api‎

0 commit comments

Comments
 (0)