Merge pull request #1 from stley/extensions

Merge all additions alltogether at master branch

Author: stley

Server/Components/CAPI/Impl/Players/APIs.cpp

@@ -596,6 +596,12 @@ OMP_CAPI(Player_GetBuildingsRemoved, int(objectPtr player))
 	return count;
 }
 
+OMP_CAPI(Player_IsBuildingRemoved, bool(objectPtr player, int model, float x, float y, float z, float radius))
+{
+	POOL_ENTITY_RET(players, IPlayer, player, player_, false);
+	return player_->isDefaultObjectRemoved(model, {x, y, z}, radius);
+}
+
 OMP_CAPI(Player_RemoveFromVehicle, bool(objectPtr player, bool force))
 {
 	POOL_ENTITY_RET(players, IPlayer, player, player_, false);

Server/Components/CAPI/Impl/Vehicles/APIs.cpp

@@ -780,3 +780,23 @@ OMP_CAPI(Vehicle_CountOccupants, int(objectPtr vehicle))
 
 	return occupants;
 }
+
+OMP_CAPI(ShowVehicle, bool(objectPtr vehicle))
+{
+	POOL_ENTITY_RET(vehicles, IVehicle, vehicle, vehicle_, 0);
+	vehicle_->toggleHide(false);
+	return true;
+}
+
+OMP_CAPI(HideVehicle, bool(objectPtr vehicle))
+{
+	POOL_ENTITY_RET(vehicles, IVehicle, vehicle, vehicle_, 0);
+	vehicle_->toggleHide(true);
+	return true;
+}
+
+OMP_CAPI(IsVehicleHidden, bool(objectPtr vehicle))
+{
+	POOL_ENTITY_RET(vehicles, IVehicle, vehicle, vehicle_, 0);
+	return vehicle_->isHidden();
+}

Server/Components/Pawn/Scripting/Player/Natives.cpp

@@ -502,7 +502,12 @@ SCRIPT_API(RemoveBuildingForPlayer, bool(IPlayer& player, uint32_t model, Vector
 
 SCRIPT_API(GetPlayerBuildingsRemoved, int(IPlayer& player))
 {
-	return player.getDefaultObjectsRemoved();
+	return player.getDefaultObjectsRemovedCount();
+}
+
+SCRIPT_API(IsBuildingRemovedForPlayer, bool(IPlayer& player, uint32_t model, Vector3 pos, float radius))
+{
+	return player.isDefaultObjectRemoved(model, pos, radius);
 }
 
 SCRIPT_API(RemovePlayerFromVehicle, bool(IPlayer& player))

Server/Components/Pawn/Scripting/Vehicle/Natives.cpp

@@ -679,3 +679,20 @@ SCRIPT_API(CountVehicleOccupants, int(IVehicle& vehicle))
 	occupants += passengers.size();
 	return occupants;
 }
+
+SCRIPT_API(ShowVehicle, bool(IVehicle& vehicle))
+{
+	vehicle.toggleHide(false);
+	return true;
+}
+
+SCRIPT_API(HideVehicle, bool(IVehicle& vehicle))
+{
+	vehicle.toggleHide(true);
+	return true;
+}
+
+SCRIPT_API(IsVehicleHidden, bool(IVehicle& vehicle))
+{
+	return vehicle.isHidden();
+}

Server/Components/Vehicles/vehicle.hpp

@@ -67,6 +67,7 @@ class Vehicle final : public IVehicle, public PoolIDProvider, public NoCopy
 	uint32_t hydraThrustAngle = 0;
 	float trainSpeed = 0.0f;
 	int lastDriverPoolID = INVALID_PLAYER_ID;
+	bool hidden_ = false;
 
 	/// Update the vehicle occupied status - set beenOccupied to true and update the lastOccupied time.
 	void updateOccupied()
@@ -154,6 +155,16 @@ class Vehicle final : public IVehicle, public PoolIDProvider, public NoCopy
 	~Vehicle();
 	void destream();
 
+	void toggleHide(bool value) override
+	{
+		hidden_ = value;
+	}
+
+	bool isHidden() const override
+	{
+		return hidden_;
+	}
+
 	int getVirtualWorld() const override
 	{
 		return virtualWorld_;

Server/Components/Vehicles/vehicles_impl.hpp

@@ -706,7 +706,7 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
 				}
 
 				const Vector2 dist2D = vehicle->getPosition() - player.getPosition();
-				const bool shouldBeStreamedIn = state != PlayerState_None && player.getVirtualWorld() == vehicle->getVirtualWorld() && (playerVehicle == vehicle || glm::dot(dist2D, dist2D) < maxDist);
+				const bool shouldBeStreamedIn = state != PlayerState_None && (vehicle->isHidden() != true) && player.getVirtualWorld() == vehicle->getVirtualWorld() && (playerVehicle == vehicle || glm::dot(dist2D, dist2D) < maxDist);
 
 				const bool isStreamedIn = vehicle->isStreamedInForPlayer(player);
 				if (!isStreamedIn && shouldBeStreamedIn)

Server/Source/player_impl.hpp

@@ -53,6 +53,13 @@ enum SecondarySyncUpdateType
 	SecondarySyncUpdateType_Trailer = (1 << 2),
 };
 
+struct RemovedDefaultObject
+{
+	unsigned ModelId;
+	Vector3 pos;
+	float radius;
+};
+
 struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 {
 	PlayerPool& pool_;
@@ -113,12 +120,14 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 	PlayerSpectateData spectateData_;
 	float gravity_;
 	bool ghostMode_;
-	int defaultObjectsRemoved_;
+	//int defaultObjectsRemoved_;
+	DynamicArray<RemovedDefaultObject> defaultObjectsRemoved_;
 	bool allowWeapons_;
 	bool allowTeleport_;
 	bool isUsingOfficialClient_;
 	bool isUsingOmp_;
 	bool leavingSpec_;
+	
 
 	PrimarySyncUpdateType primarySyncUpdateType_;
 	int secondarySyncUpdateType_;
@@ -200,7 +209,7 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 		spectateData_ = { false, INVALID_PLAYER_ID, PlayerSpectateData::ESpectateType::None };
 		gravity_ = 0.0f;
 		ghostMode_ = false;
-		defaultObjectsRemoved_ = 0;
+		defaultObjectsRemoved_.clear();
 		primarySyncUpdateType_ = PrimarySyncUpdateType::None;
 		secondarySyncUpdateType_ = 0;
 		leavingSpec_ = false;
@@ -258,7 +267,6 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 		, spectateData_({ false, INVALID_PLAYER_ID, PlayerSpectateData::ESpectateType::None })
 		, gravity_(0.0f)
 		, ghostMode_(false)
-		, defaultObjectsRemoved_(0)
 		, allowWeapons_(true)
 		, allowTeleport_(false)
 		, isUsingOfficialClient_(params.isUsingOfficialClient)
@@ -946,17 +954,35 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 
 	void removeDefaultObjects(unsigned model, Vector3 pos, float radius) override
 	{
-		defaultObjectsRemoved_++;
+		RemovedDefaultObject theObject;
+		theObject.ModelId = model;
+		theObject.pos = pos;
+		theObject.radius = radius;
+
+		defaultObjectsRemoved_.push(theObject);
+		//defaultObjectsRemoved_++;
 		NetCode::RPC::RemoveBuildingForPlayer removeBuildingForPlayerRPC;
 		removeBuildingForPlayerRPC.ModelID = model;
 		removeBuildingForPlayerRPC.Position = pos;
 		removeBuildingForPlayerRPC.Radius = radius;
 		PacketHelper::send(removeBuildingForPlayerRPC, *this);
 	}
 
-	int getDefaultObjectsRemoved() const override
+	int getDefaultObjectsRemovedCount() const override
 	{
-		return defaultObjectsRemoved_;
+		return defaultObjectsRemoved_.size();
+	}
+
+	bool isDefaultObjectRemoved(unsigned model, Vector3 pos, float radius) const override
+	{
+		for (const auto& object : defaultObjectsRemoved_)
+		{
+			if (model != object.ModelId) continue;
+			if (pos != object.pos) continue;
+			if (radius != object.radius) continue;
+			return true;
+		}
+		return false;
 	}
 
 	bool getKickStatus() const override