mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Fix #3899: Game crashes after hosting my server

Browse Source 
Catch exceptions when loading groups.json.
This commit is contained in:
Michał Janiszewski
2016-07-04 18:50:09 +02:00
committed by Ted John
parent b4886d5088
commit f3786b3130
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/network/network.cpp
View File

@@ -830,6 +830,30 @@ void Network::SaveGroups()
}
}
void Network::SetupDefaultGroups()
{
std::unique_ptr<NetworkGroup> admin(new NetworkGroup()); // change to make_unique in c++14
admin->SetName("Admin");
admin->ActionsAllowed.fill(0xFF);
admin->Id = 0;
group_list.push_back(std::move(admin));
std::unique_ptr<NetworkGroup> spectator(new NetworkGroup()); // change to make_unique in c++14
spectator->SetName("Spectator");
spectator->ToggleActionPermission(0); // Chat
spectator->Id = 1;
group_list.push_back(std::move(spectator));
std::unique_ptr<NetworkGroup> user(new NetworkGroup()); // change to make_unique in c++14
user->SetName("User");
user->ActionsAllowed.fill(0xFF);
user->ToggleActionPermission(15); // Kick Player
user->ToggleActionPermission(16); // Modify Groups
user->ToggleActionPermission(17); // Set Player Group
user->ToggleActionPermission(18); // Cheat
user->Id = 2;
group_list.push_back(std::move(user));
SetDefaultGroup(1);
}
void Network::LoadGroups()
{
group_list.clear();
@@ -839,33 +863,16 @@ void Network::LoadGroups()
platform_get_user_directory(path, NULL);
strcat(path, "groups.json");
if (!platform_file_exists(path)) {
json_t * json = nullptr;
try {
json = Json::ReadFromFile(path);
} catch (const Exception& e) {
log_error("Failed to read %s as JSON. Setting default groups. %s", path, e.GetMsg());
// Hardcoded permission groups
std::unique_ptr<NetworkGroup> admin(new NetworkGroup()); // change to make_unique in c++14
admin->SetName("Admin");
admin->ActionsAllowed.fill(0xFF);
admin->Id = 0;
group_list.push_back(std::move(admin));
std::unique_ptr<NetworkGroup> spectator(new NetworkGroup()); // change to make_unique in c++14
spectator->SetName("Spectator");
spectator->ToggleActionPermission(0); // Chat
spectator->Id = 1;
group_list.push_back(std::move(spectator));
std::unique_ptr<NetworkGroup> user(new NetworkGroup()); // change to make_unique in c++14
user->SetName("User");
user->ActionsAllowed.fill(0xFF);
user->ToggleActionPermission(15); // Kick Player
user->ToggleActionPermission(16); // Modify Groups
user->ToggleActionPermission(17); // Set Player Group
user->ToggleActionPermission(18); // Cheat
user->Id = 2;
group_list.push_back(std::move(user));
SetDefaultGroup(1);
SetupDefaultGroups();
return;
}
json_t * json = Json::ReadFromFile(path);
json_t * json_groups = json_object_get(json, "groups");
size_t groupCount = (size_t)json_array_size(json_groups);
for (size_t i = 0; i < groupCount; i++) {