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

Fix formatting. Initialise to bad value

This commit is contained in:
duncanspumpkin 2019-03-16 16:41:18 +00:00
parent 24e9428731
commit cb087e3b4e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/actions/ParkSetParameterAction.hpp
View File

@ -25,7 +25,7 @@ enum class ParkParameter : uint8_t
DEFINE_GAME_ACTION(ParkSetParameterAction, GAME_COMMAND_SET_PARK_OPEN, GameActionResult)
{
private:
uint8_t _parameter;
uint8_t _parameter{ static_cast<uint8_t>(ParkParameter::Count) };
uint64_t _value;
constexpr static rct_string_id _ErrorTitles[] = { STR_CANT_CLOSE_PARK, STR_CANT_OPEN_PARK, STR_NONE, STR_NONE };

3
src/openrct2/rct2/S6Importer.cpp
View File

@ -334,7 +334,8 @@ public:
gMapSizeMinus2 = _s6.map_size_minus_2;
gMapSize = _s6.map_size;
gMapSizeMaxXY = _s6.map_max_xy;
gSamePriceThroughoutPark = _s6.same_price_throughout | (static_cast<uint64_t>(_s6.same_price_throughout_extended) << 32);
gSamePriceThroughoutPark = _s6.same_price_throughout
| (static_cast<uint64_t>(_s6.same_price_throughout_extended) << 32);
_suggestedGuestMaximum = _s6.suggested_max_guests;
gScenarioParkRatingWarningDays = _s6.park_rating_warning_days;
gLastEntranceStyle = _s6.last_entrance_style;