Skip to content

Return string length for some natives #1098

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

Merged
merged 3 commits into from
Jul 18, 2025
Merged

Return string length for some natives #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
451ece8
Return string length in GetWeaponName, NetStats_GetIpPort
NexiusTailer Jun 7, 2025
e07cfda
Correct GetSVarNameAtIndex return value
NexiusTailer Jun 7, 2025
78d351e
Correct GetPVarNameAtIndex return value
NexiusTailer Jun 7, 2025
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
10 changes: 5 additions & 5 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 @@ -598,10 +598,10 @@ SCRIPT_API(GetServerVarAsString, int(std::string const& cvar, OutputOnlyString&
return getConfigOptionAsString(cvar, buffer);
}

SCRIPT_API(GetWeaponName, bool(int weaponid, OutputOnlyString& weapon))
SCRIPT_API(GetWeaponName, int(int weaponid, OutputOnlyString& weapon))
{
weapon = PawnManager::Get()->core->getWeaponName(PlayerWeapon(weaponid));
return true;
return std::get<StringView>(weapon).length();
}

SCRIPT_API(LimitGlobalChatRadius, bool(float chatRadius))
Expand Down Expand Up @@ -642,7 +642,7 @@ SCRIPT_API(NetStats_GetConnectedTime, int(IPlayer& player))
return stats.connectionElapsedTime;
}

SCRIPT_API(NetStats_GetIpPort, bool(IPlayer& player, OutputOnlyString& output))
SCRIPT_API_FAILRET(NetStats_GetIpPort, -1, int(IPlayer& player, OutputOnlyString& output))
{
PeerNetworkData data = player.getNetworkData();
PeerAddress::AddressString addressString;
Expand All @@ -653,9 +653,9 @@ SCRIPT_API(NetStats_GetIpPort, bool(IPlayer& player, OutputOnlyString& output))
ip_port += std::to_string(data.networkID.port);
// Scope-allocated string, copy it
output = ip_port;
return true;
return std::get<String>(output).length();
}
return false;
return FailRet;
}

SCRIPT_API(NetStats_MessagesReceived, int(IPlayer& player))
Expand Down
4 changes: 2 additions & 2 deletions Server/Components/Pawn/Scripting/Variable/Natives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ SCRIPT_API(GetSVarsUpperIndex, int())
return component->size();
}

SCRIPT_API(GetSVarNameAtIndex, bool(int index, OutputOnlyString& output))
SCRIPT_API(GetSVarNameAtIndex, int(int index, OutputOnlyString& output))
{
GET_VAR_COMP(component, false);
StringView varname;
Expand All @@ -99,7 +99,7 @@ SCRIPT_API(GetSVarNameAtIndex, bool(int index, OutputOnlyString& output))
{
output = varname;
}
return res;
return std::get<StringView>(output).length();
}

SCRIPT_API(GetSVarType, int(const std::string& varname))
Expand Down
4 changes: 2 additions & 2 deletions Server/Components/Pawn/Scripting/Variable/PlayerNatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ SCRIPT_API(GetPVarsUpperIndex, int(IPlayer& player))
return component->size();
}

SCRIPT_API(GetPVarNameAtIndex, bool(IPlayer& player, int index, OutputOnlyString& output))
SCRIPT_API(GetPVarNameAtIndex, int(IPlayer& player, int index, OutputOnlyString& output))
{
GET_PLAYER_VAR_COMP(component, false);
StringView varname;
Expand All @@ -85,7 +85,7 @@ SCRIPT_API(GetPVarNameAtIndex, bool(IPlayer& player, int index, OutputOnlyString
{
output = varname;
}
return res;
return std::get<StringView>(output).length();
}

SCRIPT_API(GetPVarType, int(IPlayer& player, const std::string& varname))
Expand Down
Loading