mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use json_is_true instead of json_boolean_value 

This should lower required version of jansson, which would
let us use 2.5 in Trusty (current version in Travis-CI)

See https://github.com/akheron/jansson/issues/146
This commit is contained in:
Michał Janiszewski 2016-11-09 13:17:21 +01:00
parent 44e9129af5
commit 867de18c96
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/twitch.cpp
View File

@ -88,9 +88,9 @@ namespace Twitch
json_t * isMod = json_object_get(json, "isMod");
member.Name = json_string_value(name);
member.IsFollower = json_boolean_value(isFollower);
member.IsInChat = json_boolean_value(isInChat);
member.IsMod = json_boolean_value(isMod);
member.IsFollower = json_is_true(isFollower);
member.IsInChat = json_is_true(isInChat);
member.IsMod = json_is_true(isMod);
member.Exists = false;
member.ShouldTrack = false;
return member;

2
src/windows/server_list.c
View File

@ -838,7 +838,7 @@ static void fetch_servers_callback(http_json_response* response)
SafeFree(newserver->description);
SafeFree(newserver->version);
newserver->name = _strdup(json_string_value(name));
newserver->requiresPassword = json_boolean_value(requiresPassword);
newserver->requiresPassword = json_is_true(requiresPassword);
newserver->description = _strdup(description == NULL ? "" : json_string_value(description));
newserver->version = _strdup(json_string_value(version));
newserver->players = (uint8)json_integer_value(players);