mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Correct formatting for source files up to the rct2 folder

Browse Source
This commit is contained in:
Hielke Morsink
2018-07-11 00:49:11 +02:00
parent 3bb57f7efd
commit 9cf4ea675f
5 changed files with 105 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/peep/Guest.cpp
View File

@@ -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);

16
src/openrct2/peep/Peep.h
View File

@@ -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)

89
src/openrct2/peep/Staff.cpp
View File

@@ -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
/**
*

40
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1839,15 +1839,17 @@ private:
LoadObjects(OBJECT_TYPE_SCENERY_GROUP, _sceneryGroupEntries);
LoadObjects(
OBJECT_TYPE_BANNERS,
std::vector<const char*>({ "BN1 ",
"BN2 ",
"BN3 ",
"BN4 ",
"BN5 ",
"BN6 ",
"BN7 ",
"BN8 ",
"BN9 " }));
std::vector<const char*>({
"BN1 ",
"BN2 ",
"BN3 ",
"BN4 ",
"BN5 ",
"BN6 ",
"BN7 ",
"BN8 ",
"BN9 ",
}));
LoadObjects(OBJECT_TYPE_PARK_ENTRANCE, std::vector<const char*>({ "PKENT1 " }));
LoadObjects(OBJECT_TYPE_WATER, _waterEntry);
}
@@ -1910,15 +1912,17 @@ private:
AppendRequiredObjects(
result,
OBJECT_TYPE_BANNERS,
std::vector<const char*>({ "BN1 ",
"BN2 ",
"BN3 ",
"BN4 ",
"BN5 ",
"BN6 ",
"BN7 ",
"BN8 ",
"BN9 " }));
std::vector<const char*>({
"BN1 ",
"BN2 ",
"BN3 ",
"BN4 ",
"BN5 ",
"BN6 ",
"BN7 ",
"BN8 ",
"BN9 ",
}));
AppendRequiredObjects(result, OBJECT_TYPE_PARK_ENTRANCE, std::vector<const char*>({ "PKENT1 " }));
AppendRequiredObjects(result, OBJECT_TYPE_WATER, _waterEntry);
return result;

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

@@ -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
}
}