mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Merge pull request #16740 from IntelOrca/precise-patrol-areas

Browse Source 
Allow patrol areas to be single tiles.
This commit is contained in:
Ted John
2022-03-13 15:20:33 +00:00
committed by GitHub
parent 37c0fffb99 5334b8f5c8
commit 27ed19002a
34 changed files with 807 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/openrct2/paint/tile_element/Paint.Path.cpp
View File

@@ -15,6 +15,7 @@
#include "../../core/Numerics.hpp"
#include "../../drawing/LightFX.h"
#include "../../entity/EntityRegistry.h"
#include "../../entity/PatrolArea.h"
#include "../../entity/Peep.h"
#include "../../entity/Staff.h"
#include "../../interface/Viewport.h"
@@ -898,45 +899,19 @@ static bool ShouldDrawSupports(paint_session& session, const PathElement& pathEl
static void PaintPatrolAreas(paint_session& session, const PathElement& pathEl)
{
if (gStaffDrawPatrolAreas != 0xFFFF)
auto colour = GetPatrolAreaTileColour(session.MapPosition);
if (colour)
{
// TODO: Split this into two.
auto staffIndex = gStaffDrawPatrolAreas;
auto staffType = static_cast<StaffType>(staffIndex & 0x7FFF);
auto is_staff_list = staffIndex & 0x8000;
auto patrolColour = COLOUR_LIGHT_BLUE;
if (!is_staff_list)
uint32_t baseImageIndex = SPR_TERRAIN_STAFF;
auto patrolAreaBaseZ = pathEl.GetBaseZ();
if (pathEl.IsSloped())
{
Staff* staff = GetEntity<Staff>(EntityId::FromUnderlying(staffIndex));
if (staff == nullptr)
{
log_error("Invalid staff index for draw patrol areas!");
}
else
{
if (!staff->IsPatrolAreaSet(session.MapPosition))
{
patrolColour = COLOUR_GREY;
}
staffType = staff->AssignedStaffType;
}
baseImageIndex = SPR_TERRAIN_STAFF_SLOPED + ((pathEl.GetSlopeDirection() + session.CurrentRotation) & 3);
patrolAreaBaseZ += 16;
}
if (staff_is_patrol_area_set_for_type(staffType, session.MapPosition))
{
uint32_t baseImageIndex = SPR_TERRAIN_STAFF;
auto patrolAreaBaseZ = pathEl.GetBaseZ();
if (pathEl.IsSloped())
{
baseImageIndex = SPR_TERRAIN_STAFF_SLOPED + ((pathEl.GetSlopeDirection() + session.CurrentRotation) & 3);
patrolAreaBaseZ += 16;
}
auto imageId = ImageId(baseImageIndex, patrolColour);
PaintAddImageAsParent(session, imageId, { 16, 16, patrolAreaBaseZ + 2 }, { 1, 1, 0 });
}
auto imageId = ImageId(baseImageIndex, *colour);
PaintAddImageAsParent(session, imageId, { 16, 16, patrolAreaBaseZ + 2 }, { 1, 1, 0 });
}
}