Add IsValidWeapon native (openmultiplayer#1009)

shierru · Oct 23, 2024 · b876351 · b876351
1 parent 01d70fb
commit b876351
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Server/Components/Pawn/Scripting/Core/Natives.cpp b/Server/Components/Pawn/Scripting/Core/Natives.cpp
@@ -600,6 +600,11 @@ SCRIPT_API(GetWeaponName, bool(int weaponid, OutputOnlyString& weapon))
 	return true;
 }
 
+SCRIPT_API(IsValidWeapon, bool(int weaponid))
+{
+	return PawnManager::Get()->core->isWeaponValid(PlayerWeapon(weaponid));
+}
+
 SCRIPT_API(LimitGlobalChatRadius, bool(float chatRadius))
 {
 	*PawnManager::Get()->config->getBool("game.use_chat_radius") = true;

diff --git a/Server/Source/core_impl.hpp b/Server/Source/core_impl.hpp
@@ -1995,6 +1995,16 @@ class Core final : public ICore, public PlayerConnectEventHandler, public Consol
 		return PlayerWeaponNames[index];
 	}
 
+	bool isWeaponValid(PlayerWeapon weapon) override
+	{
+		int index = int(weapon);
+
+		if (weapon < 0 || weapon > PlayerWeapon_End)
+			return false;
+
+		return true;
+	}
+
 	void onPlayerConnect(IPlayer& player) override
 	{
 		playerInit(player);