Merge pull request #798 from openmultiplayer/amir/no-exceptions

New way of handling ParamCast errors instead of throwing exceptions.
openmultiplayer · Dec 8, 2023 · 66d854f · 66d854f
2 parents c11feac + b69202d
commit 66d854f
Show file tree

Hide file tree

Showing 7 changed files with 1,376 additions and 1,285 deletions.
diff --git a/...lude/Server/Components/Pawn/pawn_impl.hpp → ...Server/Components/Pawn/Impl/pawn_impl.hpp b/...lude/Server/Components/Pawn/pawn_impl.hpp → ...Server/Components/Pawn/Impl/pawn_impl.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // This file should only be included in one place.
-#include "pawn.hpp"
+#include <Server/Components/Pawn/pawn.hpp>
 
 #if defined PAWN_NATIVES_HAS_FUNC
 #include <pawn-natives/NativesMain.hpp>

diff --git a/SDK/include/Server/Components/Pawn/Impl/pawn_natives.hpp b/SDK/include/Server/Components/Pawn/Impl/pawn_natives.hpp
diff --git a/SDK/include/Server/Components/Pawn/pawn.hpp b/SDK/include/Server/Components/Pawn/pawn.hpp
@@ -16,7 +16,6 @@
 #include <Server/Components/GangZones/gangzones.hpp>
 #include <Server/Components/Menus/menus.hpp>
 #include <Server/Components/Objects/objects.hpp>
-#include <Server/Components/Pawn/pawn.hpp>
 #include <Server/Components/Pickups/pickups.hpp>
 #include <Server/Components/Recordings/recordings.hpp>
 #include <Server/Components/TextDraws/textdraws.hpp>

diff --git a/SDK/include/Server/Components/Pawn/pawn_natives.hpp b/SDK/include/Server/Components/Pawn/pawn_natives.hpp
diff --git a/Server/Components/Pawn/Scripting/Types.hpp b/Server/Components/Pawn/Scripting/Types.hpp
@@ -15,7 +15,7 @@
 #include "../Manager/Manager.hpp"
 #include "Impl.hpp"
 #include "sdk.hpp"
-#include <Server/Components/Pawn/pawn_natives.hpp>
+#include <Server/Components/Pawn/Impl/pawn_natives.hpp>
 
 namespace pawn_natives
 {
@@ -40,6 +40,11 @@ class ParamCast<PawnScript&>
 		return *value_;
 	}
 
+	bool Error() const
+	{
+		return false;
+	}
+
 	static constexpr int Size = 0;
 
 private:

diff --git a/Server/Components/Pawn/Scripting/Vehicle/Natives.cpp b/Server/Components/Pawn/Scripting/Vehicle/Natives.cpp
@@ -281,9 +281,10 @@ SCRIPT_API(VehicleCanHaveComponent, bool(int modelid, int componentid))
 	return Impl::isValidComponentForVehicleModel(modelid, componentid);
 }
 
-SCRIPT_API(GetRandomCarColPair, void(int modelid, int& colour1, int& colour2, int& colour3, int& colour4))
+SCRIPT_API(GetRandomCarColPair, bool(int modelid, int& colour1, int& colour2, int& colour3, int& colour4))
 {
 	getRandomVehicleColour(modelid, colour1, colour2, colour3, colour4);
+	return true;
 }
 
 SCRIPT_API(CarColIndexToColour, int(int colourIndex, int alpha))

diff --git a/lib/pawn-natives b/lib/pawn-natives