mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 02:05:13 +01:00
Code Issues Releases Wiki Activity

Remove Network function name prefixes given namespace qualifiers

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-31 16:02:43 +02:00
parent 58569d6d50
commit 5a4cc7d00d
73 changed files with 1060 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -588,7 +588,7 @@ void ScriptEngine::RefreshPlugins()
}
// Turn on hot reload if not already enabled
if (!_hotReloadingInitialised && Config::Get().plugin.EnableHotReloading && NetworkGetMode() == NETWORK_MODE_NONE)
if (!_hotReloadingInitialised && Config::Get().plugin.EnableHotReloading && Network::GetMode() == Network::Mode::none)
{
SetupHotReloading();
}
@@ -908,8 +908,8 @@ void ScriptEngine::StartTransientPlugins()
bool ScriptEngine::ShouldStartPlugin(const std::shared_ptr<Plugin>& plugin)
{
auto networkMode = NetworkGetMode();
if (networkMode == NETWORK_MODE_CLIENT)
auto networkMode = Network::GetMode();
if (networkMode == Network::Mode::client)
{
// Only client plugins and plugins downloaded from server should be started
const auto& metadata = plugin->GetMetadata();
@@ -1561,9 +1561,9 @@ std::unique_ptr<GameActions::GameAction> ScriptEngine::CreateGameAction(
duk_pop(ctx);
auto customAction = std::make_unique<GameActions::CustomAction>(actionid, json, pluginName);
if (customAction->GetPlayer() == -1 && NetworkGetMode() != NETWORK_MODE_NONE)
if (customAction->GetPlayer() == -1 && Network::GetMode() != Network::Mode::none)
{
customAction->SetPlayer(NetworkGetCurrentPlayerId());
customAction->SetPlayer(Network::GetCurrentPlayerId());
}
return customAction;
}
@@ -1817,7 +1817,7 @@ std::string OpenRCT2::Scripting::ProcessString(const DukValue& value)
bool OpenRCT2::Scripting::IsGameStateMutable()
{
// Allow single player to alter game state anywhere
if (NetworkGetMode() == NETWORK_MODE_NONE)
if (Network::GetMode() == Network::Mode::none)
{
return true;
}
@@ -1830,7 +1830,7 @@ bool OpenRCT2::Scripting::IsGameStateMutable()
void OpenRCT2::Scripting::ThrowIfGameStateNotMutable()
{
// Allow single player to alter game state anywhere
if (NetworkGetMode() != NETWORK_MODE_NONE)
if (Network::GetMode() != Network::Mode::none)
{
auto& scriptEngine = GetContext()->GetScriptEngine();
auto& execInfo = scriptEngine.GetExecInfo();

56
src/openrct2/scripting/bindings/network/ScNetwork.cpp
View File

@@ -27,12 +27,14 @@ namespace OpenRCT2::Scripting
std::string ScNetwork::mode_get() const
{
#ifndef DISABLE_NETWORK
switch (NetworkGetMode())
switch (Network::GetMode())
{
case NETWORK_MODE_SERVER:
case Network::Mode::server:
return "server";
case NETWORK_MODE_CLIENT:
case Network::Mode::client:
return "client";
default:
break;
}
#endif
return "none";
@@ -41,7 +43,7 @@ namespace OpenRCT2::Scripting
int32_t ScNetwork::numPlayers_get() const
{
#ifndef DISABLE_NETWORK
return NetworkGetNumPlayers();
return Network::GetNumPlayers();
#else
return 0;
#endif
@@ -50,7 +52,7 @@ namespace OpenRCT2::Scripting
int32_t ScNetwork::numGroups_get() const
{
#ifndef DISABLE_NETWORK
return NetworkGetNumGroups();
return Network::GetNumGroups();
#else
return 0;
#endif
@@ -59,7 +61,7 @@ namespace OpenRCT2::Scripting
int32_t ScNetwork::defaultGroup_get() const
{
#ifndef DISABLE_NETWORK
return NetworkGetDefaultGroup();
return Network::GetDefaultGroup();
#else
return 0;
#endif
@@ -77,10 +79,10 @@ namespace OpenRCT2::Scripting
{
std::vector<std::shared_ptr<ScPlayerGroup>> groups;
#ifndef DISABLE_NETWORK
auto numGroups = NetworkGetNumGroups();
auto numGroups = Network::GetNumGroups();
for (int32_t i = 0; i < numGroups; i++)
{
auto groupId = NetworkGetGroupID(i);
auto groupId = Network::GetGroupID(i);
groups.push_back(std::make_shared<ScPlayerGroup>(groupId));
}
#endif
@@ -91,10 +93,10 @@ namespace OpenRCT2::Scripting
{
std::vector<std::shared_ptr<ScPlayer>> players;
#ifndef DISABLE_NETWORK
auto numPlayers = NetworkGetNumPlayers();
auto numPlayers = Network::GetNumPlayers();
for (int32_t i = 0; i < numPlayers; i++)
{
auto playerId = NetworkGetPlayerID(i);
auto playerId = Network::GetPlayerID(i);
players.push_back(std::make_shared<ScPlayer>(playerId));
}
#endif
@@ -105,7 +107,7 @@ namespace OpenRCT2::Scripting
{
std::shared_ptr<ScPlayer> player;
#ifndef DISABLE_NETWORK
auto playerId = NetworkGetCurrentPlayerId();
auto playerId = Network::GetCurrentPlayerId();
player = std::make_shared<ScPlayer>(playerId);
#endif
return player;
@@ -117,16 +119,16 @@ namespace OpenRCT2::Scripting
if (GetTargetAPIVersion() < kApiVersionNetworkIDs)
{
auto index = id;
auto numPlayers = NetworkGetNumPlayers();
auto numPlayers = Network::GetNumPlayers();
if (index < numPlayers)
{
auto playerId = NetworkGetPlayerID(index);
auto playerId = Network::GetPlayerID(index);
return std::make_shared<ScPlayer>(playerId);
}
}
else
{
auto index = NetworkGetPlayerIndex(id);
auto index = Network::GetPlayerIndex(id);
if (index != -1)
{
return std::make_shared<ScPlayer>(id);
@@ -141,7 +143,7 @@ namespace OpenRCT2::Scripting
{
#ifndef DISABLE_NETWORK
auto obj = OpenRCT2::Scripting::DukObject(_context);
auto networkStats = NetworkGetStats();
auto networkStats = Network::GetStats();
{
duk_push_array(_context);
duk_uarridx_t index = 0;
@@ -176,16 +178,16 @@ namespace OpenRCT2::Scripting
if (GetTargetAPIVersion() < kApiVersionNetworkIDs)
{
auto index = id;
auto numGroups = NetworkGetNumGroups();
auto numGroups = Network::GetNumGroups();
if (index < numGroups)
{
auto groupId = NetworkGetGroupID(index);
auto groupId = Network::GetGroupID(index);
return std::make_shared<ScPlayerGroup>(groupId);
}
}
else
{
auto index = NetworkGetGroupIndex(id);
auto index = Network::GetGroupIndex(id);
if (index != -1)
{
return std::make_shared<ScPlayerGroup>(id);
@@ -209,17 +211,17 @@ namespace OpenRCT2::Scripting
if (GetTargetAPIVersion() < kApiVersionNetworkIDs)
{
auto index = id;
auto numGroups = NetworkGetNumGroups();
auto numGroups = Network::GetNumGroups();
if (index < numGroups)
{
auto groupId = NetworkGetGroupID(index);
auto groupId = Network::GetGroupID(index);
auto networkAction = GameActions::NetworkModifyGroupAction(GameActions::ModifyGroupType::RemoveGroup, groupId);
GameActions::Execute(&networkAction);
}
}
else
{
auto index = NetworkGetGroupIndex(id);
auto index = Network::GetGroupIndex(id);
if (index != -1)
{
auto networkAction = GameActions::NetworkModifyGroupAction(GameActions::ModifyGroupType::RemoveGroup, id);
@@ -235,17 +237,17 @@ namespace OpenRCT2::Scripting
if (GetTargetAPIVersion() < kApiVersionNetworkIDs)
{
auto index = id;
auto numPlayers = NetworkGetNumPlayers();
auto numPlayers = Network::GetNumPlayers();
if (index < numPlayers)
{
auto playerId = NetworkGetPlayerID(index);
auto playerId = Network::GetPlayerID(index);
auto kickPlayerAction = GameActions::PlayerKickAction(playerId);
GameActions::Execute(&kickPlayerAction);
}
}
else
{
auto index = NetworkGetPlayerIndex(id);
auto index = Network::GetPlayerIndex(id);
if (index != -1)
{
auto kickPlayerAction = GameActions::PlayerKickAction(id);
@@ -260,7 +262,7 @@ namespace OpenRCT2::Scripting
#ifndef DISABLE_NETWORK
if (players.is_array())
{
if (NetworkGetMode() == NETWORK_MODE_SERVER)
if (Network::GetMode() == Network::Mode::server)
{
std::vector<uint8_t> playerIds;
auto playerArray = players.as_array();
@@ -273,7 +275,7 @@ namespace OpenRCT2::Scripting
}
if (!playerArray.empty())
{
NetworkSendChat(message.c_str(), playerIds);
Network::SendChat(message.c_str(), playerIds);
}
}
else
@@ -283,7 +285,7 @@ namespace OpenRCT2::Scripting
}
else
{
NetworkSendChat(message.c_str());
Network::SendChat(message.c_str());
}
#endif
}

24
src/openrct2/scripting/bindings/network/ScPlayer.cpp
View File

@@ -31,10 +31,10 @@ namespace OpenRCT2::Scripting
std::string ScPlayer::name_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetPlayerIndex(_id);
auto index = Network::GetPlayerIndex(_id);
if (index == -1)
return {};
return NetworkGetPlayerName(index);
return Network::GetPlayerName(index);
#else
return {};
#endif
@@ -43,10 +43,10 @@ namespace OpenRCT2::Scripting
int32_t ScPlayer::group_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetPlayerIndex(_id);
auto index = Network::GetPlayerIndex(_id);
if (index == -1)
return {};
return NetworkGetPlayerGroup(index);
return Network::GetPlayerGroup(index);
#else
return 0;
#endif
@@ -62,10 +62,10 @@ namespace OpenRCT2::Scripting
int32_t ScPlayer::ping_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetPlayerIndex(_id);
auto index = Network::GetPlayerIndex(_id);
if (index == -1)
return {};
return NetworkGetPlayerPing(index);
return Network::GetPlayerPing(index);
#else
return 0;
#endif
@@ -74,10 +74,10 @@ namespace OpenRCT2::Scripting
int32_t ScPlayer::commandsRan_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetPlayerIndex(_id);
auto index = Network::GetPlayerIndex(_id);
if (index == -1)
return {};
return NetworkGetPlayerCommandsRan(index);
return Network::GetPlayerCommandsRan(index);
#else
return 0;
#endif
@@ -86,10 +86,10 @@ namespace OpenRCT2::Scripting
int32_t ScPlayer::moneySpent_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetPlayerIndex(_id);
auto index = Network::GetPlayerIndex(_id);
if (index == -1)
return {};
return NetworkGetPlayerMoneySpent(index);
return Network::GetPlayerMoneySpent(index);
#else
return 0;
#endif
@@ -97,12 +97,12 @@ namespace OpenRCT2::Scripting
std::string ScPlayer::ipAddress_get() const
{
return NetworkGetPlayerIPAddress(_id);
return Network::GetPlayerIPAddress(_id);
}
std::string ScPlayer::publicKeyHash_get() const
{
return NetworkGetPlayerPublicKeyHash(_id);
return Network::GetPlayerPublicKeyHash(_id);
}
void ScPlayer::Register(duk_context* ctx)

18
src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp
View File

@@ -34,10 +34,10 @@ namespace OpenRCT2::Scripting
std::string ScPlayerGroup::name_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetGroupIndex(_id);
auto index = Network::GetGroupIndex(_id);
if (index == -1)
return {};
return NetworkGetGroupName(index);
return Network::GetGroupName(index);
#else
return {};
#endif
@@ -71,16 +71,16 @@ namespace OpenRCT2::Scripting
std::vector<std::string> ScPlayerGroup::permissions_get() const
{
#ifndef DISABLE_NETWORK
auto index = NetworkGetGroupIndex(_id);
auto index = Network::GetGroupIndex(_id);
if (index == -1)
return {};
// Create array of permissions
std::vector<std::string> result;
auto permissionIndex = 0;
for (const auto& action : NetworkActions::Actions)
for (const auto& action : Network::NetworkActions::Actions)
{
if (NetworkCanPerformAction(index, static_cast<NetworkPermission>(permissionIndex)))
if (Network::CanPerformAction(index, static_cast<Network::Permission>(permissionIndex)))
{
result.push_back(TransformPermissionKeyToJS(action.PermissionName));
}
@@ -95,7 +95,7 @@ namespace OpenRCT2::Scripting
void ScPlayerGroup::permissions_set(std::vector<std::string> value)
{
#ifndef DISABLE_NETWORK
auto groupIndex = NetworkGetGroupIndex(_id);
auto groupIndex = Network::GetGroupIndex(_id);
if (groupIndex == -1)
return;
@@ -105,13 +105,13 @@ namespace OpenRCT2::Scripting
GameActions::Execute(&networkAction);
std::vector<bool> enabledPermissions;
enabledPermissions.resize(NetworkActions::Actions.size());
enabledPermissions.resize(Network::NetworkActions::Actions.size());
for (const auto& p : value)
{
auto permissionName = TransformPermissionKeyToInternal(p);
auto permissionIndex = 0;
for (const auto& action : NetworkActions::Actions)
for (const auto& action : Network::NetworkActions::Actions)
{
if (action.PermissionName == permissionName)
{
@@ -124,7 +124,7 @@ namespace OpenRCT2::Scripting
for (size_t i = 0; i < enabledPermissions.size(); i++)
{
auto toggle
= (enabledPermissions[i] != (NetworkCanPerformAction(groupIndex, static_cast<NetworkPermission>(i)) != 0));
= (enabledPermissions[i] != (Network::CanPerformAction(groupIndex, static_cast<Network::Permission>(i)) != 0));
if (toggle)
{
auto networkAction2 = GameActions::NetworkModifyGroupAction(

30
src/openrct2/scripting/bindings/network/ScSocket.hpp
View File

@@ -136,7 +136,7 @@ namespace OpenRCT2::Scripting
static constexpr uint32_t EVENT_ERROR = 3;
EventList _eventList;
std::unique_ptr<ITcpSocket> _socket;
std::unique_ptr<Network::ITcpSocket> _socket;
bool _disposed{};
bool _connecting{};
bool _wasConnected{};
@@ -147,7 +147,7 @@ namespace OpenRCT2::Scripting
{
}
ScSocket(const std::shared_ptr<Plugin>& plugin, std::unique_ptr<ITcpSocket>&& socket)
ScSocket(const std::shared_ptr<Plugin>& plugin, std::unique_ptr<Network::ITcpSocket>&& socket)
: ScSocketBase(plugin)
, _socket(std::move(socket))
{
@@ -190,7 +190,7 @@ namespace OpenRCT2::Scripting
}
else
{
_socket = CreateTcpSocket();
_socket = Network::CreateTcpSocket();
try
{
_socket->ConnectAsync(host, port);
@@ -320,14 +320,14 @@ namespace OpenRCT2::Scripting
auto status = _socket->GetStatus();
if (_connecting)
{
if (status == SocketStatus::Connected)
if (status == Network::SocketStatus::connected)
{
_connecting = false;
_wasConnected = true;
_eventList.Raise(EVENT_CONNECT_ONCE, GetPlugin(), {}, false);
_eventList.RemoveAllListeners(EVENT_CONNECT_ONCE);
}
else if (status == SocketStatus::Closed)
else if (status == Network::SocketStatus::closed)
{
_connecting = false;
@@ -342,21 +342,21 @@ namespace OpenRCT2::Scripting
_eventList.Raise(EVENT_ERROR, GetPlugin(), { dukErr }, true);
}
}
else if (status == SocketStatus::Connected)
else if (status == Network::SocketStatus::connected)
{
char buffer[16384];
size_t bytesRead{};
auto result = _socket->ReceiveData(buffer, sizeof(buffer), &bytesRead);
switch (result)
{
case NetworkReadPacket::Success:
case Network::NetworkReadPacket::success:
RaiseOnData(std::string(buffer, bytesRead));
break;
case NetworkReadPacket::NoData:
case Network::NetworkReadPacket::noData:
break;
case NetworkReadPacket::MoreData:
case Network::NetworkReadPacket::moreData:
break;
case NetworkReadPacket::Disconnected:
case Network::NetworkReadPacket::disconnected:
CloseSocket();
break;
}
@@ -398,7 +398,7 @@ namespace OpenRCT2::Scripting
static constexpr uint32_t EVENT_CONNECTION = 0;
EventList _eventList;
std::unique_ptr<ITcpSocket> _socket;
std::unique_ptr<Network::ITcpSocket> _socket;
std::vector<std::shared_ptr<ScSocket>> _scClientSockets;
bool _disposed{};
@@ -406,7 +406,7 @@ namespace OpenRCT2::Scripting
{
if (_socket != nullptr)
{
return _socket->GetStatus() == SocketStatus::Listening;
return _socket->GetStatus() == Network::SocketStatus::listening;
}
return false;
}
@@ -428,10 +428,10 @@ namespace OpenRCT2::Scripting
{
if (_socket == nullptr)
{
_socket = CreateTcpSocket();
_socket = Network::CreateTcpSocket();
}
if (_socket->GetStatus() == SocketStatus::Listening)
if (_socket->GetStatus() == Network::SocketStatus::listening)
{
duk_error(ctx, DUK_ERR_ERROR, "Server is already listening.");
}
@@ -506,7 +506,7 @@ namespace OpenRCT2::Scripting
if (_socket == nullptr)
return;
if (_socket->GetStatus() == SocketStatus::Listening)
if (_socket->GetStatus() == Network::SocketStatus::listening)
{
auto client = _socket->Accept();
if (client != nullptr)