fix

altmp · Oct 21, 2023 · 7970233 · 7970233
1 parent 6b744c0
commit 7970233
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/c-api/core.cpp b/c-api/core.cpp
@@ -133,19 +133,6 @@ alt::MValueConst* Core_CreateMValueFunction(alt::ICore* core, CustomInvoker* val
     return AllocMValue(std::move(mValue));
 }
 
-<<<<<<< HEAD
-alt::IPlayer** Core_GetPlayers(alt::ICore* core, uint64_t& size) {
-    auto players = core->GetBaseObjects(alt::IBaseObject::Type::PLAYER);
-    size = players.size();
-    auto out = new alt::IPlayer*[size];
-    for (auto i = 0; i < size; i++) {
-        out[i] = dynamic_cast<alt::IPlayer*>(players[i]);
-    }
-
-    return out;
-}
-
-=======
 uint64_t Core_GetMValueSize(alt::ICore* core, alt::MValueConst* args)
 {
     return core->GetMValueSize(args->get()->Clone());
@@ -171,7 +158,6 @@ alt::IPlayer** Core_GetPlayers(alt::ICore* core, uint64_t& size) {
     return out;
 }
 
->>>>>>> release
 alt::IVehicle** Core_GetVehicles(alt::ICore* core, uint64_t& size) {
     auto vehiclesArray = core->GetBaseObjects(alt::IBaseObject::Type::VEHICLE);
     size = vehiclesArray.size();

diff --git a/c-api/core.h b/c-api/core.h
@@ -48,11 +48,9 @@ EXPORT_SHARED alt::MValueConst* Core_CreateMValueVector2(alt::ICore* core, vecto
 EXPORT_SHARED alt::MValueConst* Core_CreateMValueRgba(alt::ICore* core, rgba_t value);
 EXPORT_SHARED alt::MValueConst* Core_CreateMValueByteArray(alt::ICore* core, uint64_t size, const void* data);
 EXPORT_SHARED alt::MValueConst* Core_CreateMValueFunction(alt::ICore* core, CustomInvoker* value);
-<<<<<<< HEAD
-=======
 EXPORT_SHARED uint64_t Core_GetMValueSize(alt::ICore* core, alt::MValueConst* args);
 EXPORT_SHARED uint64_t Core_GetMValueArgsSize(alt::ICore* core, alt::MValueConst* args[], int size);
->>>>>>> release
+
 
 EXPORT_SHARED alt::IPlayer** Core_GetPlayers(alt::ICore* core, uint64_t& size);
 EXPORT_SHARED alt::IVehicle** Core_GetVehicles(alt::ICore* core, uint64_t& size);