From 9cf4ea675fa5847737cee50195dc7b9049e0d7c3 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Wed, 11 Jul 2018 00:49:11 +0200 Subject: [PATCH] Correct formatting for source files up to the rct2 folder --- src/openrct2/peep/Guest.cpp | 8 +-- src/openrct2/peep/Peep.h | 16 +++--- src/openrct2/peep/Staff.cpp | 89 ++++++++++++++++++++++---------- src/openrct2/rct1/S4Importer.cpp | 40 +++++++------- src/openrct2/rct2/S6Importer.cpp | 25 +++------ 5 files changed, 105 insertions(+), 73 deletions(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index bfe210b8f1..058016faaf 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -898,9 +898,11 @@ void rct_peep::UpdateSitting() if (!(pathingResult & PATHING_DESTINATION_REACHED)) return; - LocationXYZ16 loc = { (int16_t)((x & 0xFFE0) + BenchUseOffsets[var_37 & 0x7].x), - (int16_t)((y & 0xFFE0) + BenchUseOffsets[var_37 & 0x7].y), - z }; + LocationXYZ16 loc = { + (int16_t)((x & 0xFFE0) + BenchUseOffsets[var_37 & 0x7].x), + (int16_t)((y & 0xFFE0) + BenchUseOffsets[var_37 & 0x7].y), + z, + }; Invalidate(); MoveTo(loc.x, loc.y, loc.z); diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 26e4c67482..22cc779bf9 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -286,7 +286,7 @@ enum PEEP_ACTION_EVENTS PEEP_ACTION_WITHDRAW_MONEY = 30, PEEP_ACTION_NONE_1 = 254, - PEEP_ACTION_NONE_2 = 255 + PEEP_ACTION_NONE_2 = 255, }; enum PEEP_ACTION_SPRITE_TYPE @@ -327,7 +327,7 @@ enum PEEP_ACTION_SPRITE_TYPE PEEP_ACTION_SPRITE_TYPE_DISGUST = 33, PEEP_ACTION_SPRITE_TYPE_DRAW_PICTURE = 34, PEEP_ACTION_SPRITE_TYPE_BEING_WATCHED = 35, - PEEP_ACTION_SPRITE_TYPE_WITHDRAW_MONEY = 36 + PEEP_ACTION_SPRITE_TYPE_WITHDRAW_MONEY = 36, }; enum PEEP_FLAGS : uint32_t @@ -363,7 +363,7 @@ enum PEEP_FLAGS : uint32_t PEEP_FLAGS_INTAMIN_DEPRECATED = (1 << 27), // Used to make the peep think "I'm so excited - It's an Intamin ride!" while riding on a Intamin ride. PEEP_FLAGS_HERE_WE_ARE = (1 << 28), // Makes the peep think "...and here we are on X!" while riding a ride - PEEP_FLAGS_TWITCH = (1u << 31) // Added for twitch integration + PEEP_FLAGS_TWITCH = (1u << 31), // Added for twitch integration }; enum PEEP_NEXT_FLAGS @@ -371,7 +371,7 @@ enum PEEP_NEXT_FLAGS PEEP_NEXT_FLAG_DIRECTION_MASK = 0x3, PEEP_NEXT_FLAG_IS_SLOPED = (1 << 2), PEEP_NEXT_FLAG_IS_SURFACE = (1 << 3), - PEEP_NEXT_FLAG_UNUSED = (1 << 4) + PEEP_NEXT_FLAG_UNUSED = (1 << 4), }; enum PEEP_NAUSEA_TOLERANCE @@ -379,7 +379,7 @@ enum PEEP_NAUSEA_TOLERANCE PEEP_NAUSEA_TOLERANCE_NONE, PEEP_NAUSEA_TOLERANCE_LOW, PEEP_NAUSEA_TOLERANCE_AVERAGE, - PEEP_NAUSEA_TOLERANCE_HIGH + PEEP_NAUSEA_TOLERANCE_HIGH, }; enum PEEP_ITEM @@ -436,7 +436,7 @@ enum PEEP_ITEM PEEP_ITEM_EMPTY_DRINK_CARTON = (1 << 18), PEEP_ITEM_EMPTY_JUICE_CUP = (1 << 19), PEEP_ITEM_ROAST_SAUSAGE = (1 << 20), - PEEP_ITEM_EMPTY_BOWL_BLUE = (1 << 21) + PEEP_ITEM_EMPTY_BOWL_BLUE = (1 << 21), }; enum PEEP_SPRITE_TYPE @@ -489,7 +489,7 @@ enum PEEP_SPRITE_TYPE PEEP_SPRITE_TYPE_SAUSAGE = 45, PEEP_SPRITE_TYPE_SOUP = 46, PEEP_SPRITE_TYPE_SANDWICH = 47, - PEEP_SPRITE_TYPE_COUNT + PEEP_SPRITE_TYPE_COUNT, }; // Flags used by peep->window_invalidate_flags @@ -506,7 +506,7 @@ enum PEEP_INVALIDATE enum PEEP_RIDE_DECISION { PEEP_RIDE_DECISION_AT_QUEUE = 1, - PEEP_RIDE_DECISION_THINKING = 1 << 2 + PEEP_RIDE_DECISION_THINKING = 1 << 2, }; #pragma pack(push, 1) diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 998684ecdc..5a3a5ee834 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -2452,44 +2452,79 @@ enum * when fixing a broken down ride; * - index 8 is for inspecting a ride. */ +// clang-format off static constexpr const uint32_t FixingSubstatesForBreakdown[9] = { ( // BREAKDOWN_SAFETY_CUT_OUT - (1 << PEEP_FIXING_MOVE_TO_STATION_END) | (1 << PEEP_FIXING_FIX_STATION_END) | (1 << PEEP_FIXING_MOVE_TO_STATION_START) - | (1 << PEEP_FIXING_FIX_STATION_START) | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) - | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_STATION_END) | + (1 << PEEP_FIXING_FIX_STATION_END) | + (1 << PEEP_FIXING_MOVE_TO_STATION_START) | + (1 << PEEP_FIXING_FIX_STATION_START) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_RESTRAINTS_STUCK_CLOSED - (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | (1 << PEEP_FIXING_FIX_VEHICLE_CLOSED_RESTRAINTS) - | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) - | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | + (1 << PEEP_FIXING_FIX_VEHICLE_CLOSED_RESTRAINTS) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_RESTRAINTS_STUCK_OPEN - (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | (1 << PEEP_FIXING_FIX_VEHICLE_OPEN_RESTRAINTS) - | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) - | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | + (1 << PEEP_FIXING_FIX_VEHICLE_OPEN_RESTRAINTS) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_DOORS_STUCK_CLOSED - (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | (1 << PEEP_FIXING_FIX_VEHICLE_CLOSED_DOORS) - | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) - | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | + (1 << PEEP_FIXING_FIX_VEHICLE_CLOSED_DOORS) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_DOORS_STUCK_OPEN - (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | (1 << PEEP_FIXING_FIX_VEHICLE_OPEN_DOORS) - | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) - | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | + (1 << PEEP_FIXING_FIX_VEHICLE_OPEN_DOORS) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_VEHICLE_MALFUNCTION - (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | (1 << PEEP_FIXING_FIX_VEHICLE_MALFUNCTION) - | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) - | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_BROKEN_DOWN_VEHICLE) | + (1 << PEEP_FIXING_FIX_VEHICLE_MALFUNCTION) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_BRAKES_FAILURE - (1 << PEEP_FIXING_MOVE_TO_STATION_START) | (1 << PEEP_FIXING_FIX_STATION_BRAKES) - | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) - | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_STATION_START) | + (1 << PEEP_FIXING_FIX_STATION_BRAKES) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // BREAKDOWN_CONTROL_FAILURE - (1 << PEEP_FIXING_MOVE_TO_STATION_END) | (1 << PEEP_FIXING_FIX_STATION_END) | (1 << PEEP_FIXING_MOVE_TO_STATION_START) - | (1 << PEEP_FIXING_FIX_STATION_START) | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) - | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)), + (1 << PEEP_FIXING_MOVE_TO_STATION_END) | + (1 << PEEP_FIXING_FIX_STATION_END) | + (1 << PEEP_FIXING_MOVE_TO_STATION_START) | + (1 << PEEP_FIXING_FIX_STATION_START) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ), ( // INSPECTION - (1 << PEEP_FIXING_MOVE_TO_STATION_END) | (1 << PEEP_FIXING_FIX_STATION_END) | (1 << PEEP_FIXING_MOVE_TO_STATION_START) - | (1 << PEEP_FIXING_FIX_STATION_START) | (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) - | (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT)) + (1 << PEEP_FIXING_MOVE_TO_STATION_END) | + (1 << PEEP_FIXING_FIX_STATION_END) | + (1 << PEEP_FIXING_MOVE_TO_STATION_START) | + (1 << PEEP_FIXING_FIX_STATION_START) | + (1 << PEEP_FIXING_MOVE_TO_STATION_EXIT) | + (1 << PEEP_FIXING_FINISH_FIX_OR_INSPECT) | + (1 << PEEP_FIXING_LEAVE_BY_ENTRANCE_EXIT) + ) }; +// clang-format on /** * diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 66a8c9d7f1..5a541490f7 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1839,15 +1839,17 @@ private: LoadObjects(OBJECT_TYPE_SCENERY_GROUP, _sceneryGroupEntries); LoadObjects( OBJECT_TYPE_BANNERS, - std::vector({ "BN1 ", - "BN2 ", - "BN3 ", - "BN4 ", - "BN5 ", - "BN6 ", - "BN7 ", - "BN8 ", - "BN9 " })); + std::vector({ + "BN1 ", + "BN2 ", + "BN3 ", + "BN4 ", + "BN5 ", + "BN6 ", + "BN7 ", + "BN8 ", + "BN9 ", + })); LoadObjects(OBJECT_TYPE_PARK_ENTRANCE, std::vector({ "PKENT1 " })); LoadObjects(OBJECT_TYPE_WATER, _waterEntry); } @@ -1910,15 +1912,17 @@ private: AppendRequiredObjects( result, OBJECT_TYPE_BANNERS, - std::vector({ "BN1 ", - "BN2 ", - "BN3 ", - "BN4 ", - "BN5 ", - "BN6 ", - "BN7 ", - "BN8 ", - "BN9 " })); + std::vector({ + "BN1 ", + "BN2 ", + "BN3 ", + "BN4 ", + "BN5 ", + "BN6 ", + "BN7 ", + "BN8 ", + "BN9 ", + })); AppendRequiredObjects(result, OBJECT_TYPE_PARK_ENTRANCE, std::vector({ "PKENT1 " })); AppendRequiredObjects(result, OBJECT_TYPE_WATER, _waterEntry); return result; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index bfd576a905..94b68e2909 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -454,25 +454,16 @@ public: if (String::Equals(_s6.scenario_filename, "Europe - European Cultural Festival.SC6")) { // This scenario breaks pathfinding. Create passages between the worlds. (List is grouped by neighbouring tiles.) + // clang-format off FixLandOwnershipTilesWithOwnership( - { { 67, 94 }, - { 68, 94 }, - { 69, 94 }, - { 58, 24 }, - { 58, 25 }, - { 58, 26 }, - { 58, 27 }, - { 58, 28 }, - { 58, 29 }, - { 58, 30 }, - { 58, 31 }, - { 58, 32 }, - { 26, 44 }, - { 26, 45 }, - { 32, 79 }, - { 32, 80 }, - { 32, 81 } }, + { + { 67, 94 }, { 68, 94 }, { 69, 94 }, + { 58, 24 }, { 58, 25 }, { 58, 26 }, { 58, 27 }, { 58, 28 }, { 58, 29 }, { 58, 30 }, { 58, 31 }, { 58, 32 }, + { 26, 44 }, { 26, 45 }, + { 32, 79 }, { 32, 80 }, { 32, 81 }, + }, OWNERSHIP_OWNED); + // clang-format on } }