From 5b92f3f9ae6f42654bb17b226f353270e3f7bba6 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sun, 19 Sep 2021 09:00:51 +0100 Subject: [PATCH] Fix conversion error --- src/openrct2/actions/StaffSetPatrolAreaAction.cpp | 2 +- src/openrct2/peep/Staff.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp index 13aff35e18..fce035a3b2 100644 --- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp +++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp @@ -67,7 +67,7 @@ GameActions::Result::Ptr StaffSetPatrolAreaAction::Execute() const bool isPatrolling = false; const auto peepOffset = staff->StaffId * STAFF_PATROL_AREA_SIZE; - for (int32_t i = peepOffset; i < peepOffset + STAFF_PATROL_AREA_SIZE; i++) + for (size_t i = peepOffset; i < peepOffset + STAFF_PATROL_AREA_SIZE; i++) { if (gStaffPatrolAreas[i] != 0) { diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 71cc5b0714..2b0e27fd4c 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -143,8 +143,8 @@ void staff_update_greyed_patrol_areas() { for (int32_t staff_type = 0; staff_type < static_cast(StaffType::Count); ++staff_type) { - int32_t staffPatrolOffset = (staff_type + STAFF_MAX_COUNT) * STAFF_PATROL_AREA_SIZE; - for (int32_t i = 0; i < STAFF_PATROL_AREA_SIZE; i++) + const size_t staffPatrolOffset = (staff_type + STAFF_MAX_COUNT) * STAFF_PATROL_AREA_SIZE; + for (size_t i = 0; i < STAFF_PATROL_AREA_SIZE; i++) { gStaffPatrolAreas[staffPatrolOffset + i] = 0; } @@ -153,8 +153,8 @@ void staff_update_greyed_patrol_areas() { if (static_cast(peep->AssignedStaffType) == staff_type) { - int32_t peepPatrolOffset = peep->StaffId * STAFF_PATROL_AREA_SIZE; - for (int32_t i = 0; i < STAFF_PATROL_AREA_SIZE; i++) + const size_t peepPatrolOffset = peep->StaffId * STAFF_PATROL_AREA_SIZE; + for (size_t i = 0; i < STAFF_PATROL_AREA_SIZE; i++) { gStaffPatrolAreas[staffPatrolOffset + i] |= gStaffPatrolAreas[peepPatrolOffset + i]; }