Fix some faulty functions

MAFINS · Nov 27, 2022 · c512007 · c512007 · Super1Mario · Dec 4, 2022
1 parent f139bd6
commit c512007
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Solution/source/Scripting/GTAentity.cpp b/Solution/source/Scripting/GTAentity.cpp
@@ -521,7 +521,7 @@ Vector3 GTAentity::GetOffsetFromBoneInWorldCoords(int boneIndex, const Vector3&
 }
 Vector3 GTAentity::GetOffsetFromBoneInWorldCoords(const std::string& boneLabel, const Vector3& offset) const
 {
-	this->GetOffsetFromBoneInWorldCoords(this->GetBoneIndex(boneLabel), offset);
+	return this->GetOffsetFromBoneInWorldCoords(this->GetBoneIndex(boneLabel), offset);
 }
 bool GTAentity::HasBone(const std::string& boneLabel) const
 {

diff --git a/Solution/source/Scripting/GTAped.cpp b/Solution/source/Scripting/GTAped.cpp
@@ -129,7 +129,7 @@ bool PedGroup::Exists(PedGroup pedGroup)
 
 GTAentity PedGroup::GetMember(int index) const
 {
-	GET_PED_AS_GROUP_MEMBER(this->_handle, index);
+	return GET_PED_AS_GROUP_MEMBER(this->_handle, index);
 }
 
 bool PedGroup::Contains(GTAentity ped) const

diff --git a/Solution/source/Scripting/World.cpp b/Solution/source/Scripting/World.cpp
@@ -279,11 +279,11 @@ namespace World
 		}
 	}
 
-	std::vector<GTAprop> GetNearbyProps(std::vector<GTAprop>& result, GTAped ped, float radius)
+	void GetNearbyProps(std::vector<GTAprop>& result, GTAped ped, float radius)
 	{
 		GetNearbyProps(result, ped.Position_get(), radius);
 	}
-	std::vector<GTAprop> GetNearbyProps(std::vector<GTAprop>& result, const Vector3& position, float radius)
+	void GetNearbyProps(std::vector<GTAprop>& result, const Vector3& position, float radius)
 	{
 		//std::vector<Entity> handles;
 		//GTAmemory::GetPropHandles(handles);
@@ -528,7 +528,7 @@ namespace World
 
 	Rope AddRope(RopeType type, const Vector3& position, Vector3 rotation, float length, float minLength, bool breakable)
 	{
-		Rope::AddRope(type, position, rotation, length, minLength, breakable);
+		return Rope::AddRope(type, position, rotation, length, minLength, breakable);
 	}
 
 	void SetBlackout(bool enable)

diff --git a/Solution/source/Scripting/World.h b/Solution/source/Scripting/World.h
@@ -90,8 +90,8 @@ namespace World
 	void GetNearbyVehicles(std::vector<GTAvehicle>& result, GTAped ped, float radius, int maxAmount);
 	void GetNearbyVehicles(std::vector<GTAvehicle>& result, const Vector3& position, float radius);
 
-	std::vector<GTAprop> GetNearbyProps(std::vector<GTAprop>& result, GTAped ped, float radius);
-	std::vector<GTAprop> GetNearbyProps(std::vector<GTAprop>& result, const Vector3& position, float radius);
+	void GetNearbyProps(std::vector<GTAprop>& result, GTAped ped, float radius);
+	void GetNearbyProps(std::vector<GTAprop>& result, const Vector3& position, float radius);
 
 	GTAprop GetClosestPropOfType(const Vector3& position, float radius, const GTAmodel::Model& model, bool isMissionEntity = false);
 	GTAped GetClosestPed(const Vector3& position, float radius);
@@ -131,7 +131,7 @@ namespace World
 
 	Checkpoint CreateCheckpoint(const CheckpointIcon& icon, const Vector3& position, const Vector3& pointTo, float radius, const RGBA& colour, BYTE reserved = 0);
 
-	Rope AddRope(RopeType type, const Vector3& position, Vector3 rotation, float length, float minLength, bool breakable);
+	inline Rope AddRope(RopeType type, const Vector3& position, Vector3 rotation, float length, float minLength, bool breakable);
 
 	void SetBlackout(bool enable);