Skip to content

Add IsValidWeapon native (#1009) #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shierru wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add IsValidWeapon native (#1009) #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b876351
Add IsValidWeapon native (#1009)
shierru Oct 23, 2024
21f5390
Update check isWeaponValid
shierru Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Server/Components/Pawn/Scripting/Core/Natives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions Server/Source/core_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1995,6 +1995,14 @@ class Core final : public ICore, public PlayerConnectEventHandler, public Consol
return PlayerWeaponNames[index];
}

bool isWeaponValid(PlayerWeapon weapon) override
{
if ((weapon >= 19 && weapon <= 21) || (weapon < 0 || weapon > PlayerWeapon_End))
return false;

return true;
}

void onPlayerConnect(IPlayer& player) override
{
playerInit(player);
Expand Down