From 2f3a30f22bec866c2ee9512b1607154cf8a85887 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 1 Aug 2017 13:42:50 +0200 Subject: [PATCH] Fix cast to bool in map element functions --- src/openrct2/network/network.h | 2 +- src/openrct2/world/map.c | 4 ++-- test/testpaint/compat.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 0f8c45f3b1..7de38ade5d 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -55,7 +55,7 @@ extern "C" { // This define specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "15" +#define NETWORK_STREAM_VERSION "16" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #ifdef __cplusplus diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index c1268410d3..fb6a3bfafa 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -2886,7 +2886,7 @@ void map_element_set_track_sequence(rct_map_element * mapElement, sint32 trackSe bool map_element_get_green_light(const rct_map_element * mapElement) { - return (bool)mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT; + return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0; } void map_element_set_green_light(rct_map_element * mapElement, bool greenLight) @@ -2910,7 +2910,7 @@ void map_element_set_brake_booster_speed(rct_map_element *mapElement, sint32 spe bool map_element_is_taking_photo(const rct_map_element * mapElement) { - return (bool)mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK; + return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK) != 0; } void map_element_set_onride_photo_timeout(rct_map_element * mapElement) diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index 3679cd67fc..c60d88242f 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -164,7 +164,7 @@ void map_element_set_track_sequence(rct_map_element * mapElement, int trackSeque bool map_element_get_green_light(const rct_map_element * mapElement) { - return (bool)mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT; + return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0; } void map_element_set_green_light(rct_map_element * mapElement, bool greenLight) @@ -188,7 +188,7 @@ void map_element_set_brake_booster_speed(rct_map_element *mapElement, int speed) bool map_element_is_taking_photo(const rct_map_element * mapElement) { - return (bool)mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK; + return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK) != 0; } void map_element_set_onride_photo_timeout(rct_map_element * mapElement)