mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 07:44:38 +01:00
Code Issues Releases Wiki Activity

Use range-based for loops

Browse Source
This commit is contained in:
Hielke Morsink
2017-12-06 00:12:36 +01:00
committed by Michael Steenbeek
parent e3c52360db
commit 79aa4a99cf
6 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2/network/NetworkGroup.cpp
View File

@@ -33,19 +33,24 @@ NetworkGroup::~NetworkGroup()
NetworkGroup NetworkGroup::FromJson(const json_t * json)
{
NetworkGroup group;
json_t * jsonId = json_object_get(json, "id");
json_t * jsonName = json_object_get(json, "name");
json_t * jsonId = json_object_get(json, "id");
json_t * jsonName = json_object_get(json, "name");
json_t * jsonPermissions = json_object_get(json, "permissions");
if (jsonId == nullptr || jsonName == nullptr || jsonPermissions == nullptr)
{
throw Exception("Missing group data");
}
group.Id = (uint8)json_integer_value(jsonId);
group.Id = (uint8)json_integer_value(jsonId);
group._name = std::string(json_string_value(jsonName));
for (size_t i = 0; i < group.ActionsAllowed.size(); i++) {
group.ActionsAllowed[i] = 0;
for (auto &action : group.ActionsAllowed)
{
action = 0;
}
for (size_t i = 0; i < json_array_size(jsonPermissions); i++) {
for (size_t i = 0; i < json_array_size(jsonPermissions); i++)
{
json_t * jsonPermissionValue = json_array_get(jsonPermissions, i);
const char * perm_name = json_string_value(jsonPermissionValue);
if (perm_name == nullptr) {
@@ -91,9 +96,9 @@ void NetworkGroup::Read(NetworkPacket &packet)
{
packet >> Id;
SetName(packet.ReadString());
for (size_t i = 0; i < ActionsAllowed.size(); i++)
for (auto action : ActionsAllowed)
{
packet >> ActionsAllowed[i];
packet >> action;
}
}