mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix formatting
This commit is contained in:
parent
356a0e5e91
commit
5280728760
|
@ -1474,7 +1474,8 @@ void ride_remove_provisional_track_piece()
|
||||||
auto trackRemoveAction = TrackRemoveAction{ trackType,
|
auto trackRemoveAction = TrackRemoveAction{ trackType,
|
||||||
trackSequence,
|
trackSequence,
|
||||||
{ next_track.x, next_track.y, z, static_cast<Direction>(direction) } };
|
{ next_track.x, next_track.y, z, static_cast<Direction>(direction) } };
|
||||||
trackRemoveAction.SetFlags(GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
|
trackRemoveAction.SetFlags(
|
||||||
|
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
|
||||||
GameActions::Execute(&trackRemoveAction);
|
GameActions::Execute(&trackRemoveAction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1183,7 +1183,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
|
||||||
{
|
{
|
||||||
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_TRACK_PREVIEW)
|
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_TRACK_PREVIEW)
|
||||||
{
|
{
|
||||||
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND;
|
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED
|
||||||
|
| GAME_COMMAND_FLAG_NO_SPEND;
|
||||||
}
|
}
|
||||||
else if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_GHOST)
|
else if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_GHOST)
|
||||||
{
|
{
|
||||||
|
@ -1217,7 +1218,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
|
||||||
{
|
{
|
||||||
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_TRACK_PREVIEW)
|
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_TRACK_PREVIEW)
|
||||||
{
|
{
|
||||||
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND;
|
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED
|
||||||
|
| GAME_COMMAND_FLAG_NO_SPEND;
|
||||||
}
|
}
|
||||||
else if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_GHOST)
|
else if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_GHOST)
|
||||||
{
|
{
|
||||||
|
@ -1324,7 +1326,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
|
||||||
{
|
{
|
||||||
ride_action_modify(
|
ride_action_modify(
|
||||||
ride, RIDE_MODIFY_DEMOLISH,
|
ride, RIDE_MODIFY_DEMOLISH,
|
||||||
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
|
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND
|
||||||
|
| GAME_COMMAND_FLAG_GHOST);
|
||||||
}
|
}
|
||||||
|
|
||||||
gTrackPreviewOrigin.x = x;
|
gTrackPreviewOrigin.x = x;
|
||||||
|
@ -1563,7 +1566,8 @@ static bool track_design_place_ride(rct_track_td6* td6, int16_t x, int16_t y, in
|
||||||
uint8_t flags = GAME_COMMAND_FLAG_APPLY;
|
uint8_t flags = GAME_COMMAND_FLAG_APPLY;
|
||||||
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_TRACK_PREVIEW)
|
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_TRACK_PREVIEW)
|
||||||
{
|
{
|
||||||
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND;
|
flags = GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED
|
||||||
|
| GAME_COMMAND_FLAG_NO_SPEND;
|
||||||
}
|
}
|
||||||
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_GHOST)
|
if (_trackDesignPlaceOperation == PTD_OPERATION_PLACE_GHOST)
|
||||||
{
|
{
|
||||||
|
|
|
@ -229,7 +229,8 @@ void footpath_provisional_remove()
|
||||||
|
|
||||||
footpath_remove(
|
footpath_remove(
|
||||||
gFootpathProvisionalPosition.x, gFootpathProvisionalPosition.y, gFootpathProvisionalPosition.z,
|
gFootpathProvisionalPosition.x, gFootpathProvisionalPosition.y, gFootpathProvisionalPosition.z,
|
||||||
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
|
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND
|
||||||
|
| GAME_COMMAND_FLAG_GHOST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,8 @@ void scenery_remove_ghost_tool_placement()
|
||||||
gSceneryGhostType &= ~SCENERY_GHOST_FLAG_0;
|
gSceneryGhostType &= ~SCENERY_GHOST_FLAG_0;
|
||||||
|
|
||||||
auto removeSceneryAction = SmallSceneryRemoveAction(x, y, z, gSceneryQuadrant, gSceneryPlaceObject);
|
auto removeSceneryAction = SmallSceneryRemoveAction(x, y, z, gSceneryQuadrant, gSceneryPlaceObject);
|
||||||
removeSceneryAction.SetFlags(GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
|
removeSceneryAction.SetFlags(
|
||||||
|
GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST);
|
||||||
removeSceneryAction.Execute();
|
removeSceneryAction.Execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,7 +230,8 @@ void scenery_remove_ghost_tool_placement()
|
||||||
|
|
||||||
auto removeSceneryAction = LargeSceneryRemoveAction(x, y, z, gSceneryPlaceRotation, 0);
|
auto removeSceneryAction = LargeSceneryRemoveAction(x, y, z, gSceneryPlaceRotation, 0);
|
||||||
removeSceneryAction.SetFlags(
|
removeSceneryAction.SetFlags(
|
||||||
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND);
|
GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED
|
||||||
|
| GAME_COMMAND_FLAG_NO_SPEND);
|
||||||
removeSceneryAction.Execute();
|
removeSceneryAction.Execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue