mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix more CI errors

This commit is contained in:
Ted John 2021-04-11 14:39:31 +01:00
parent 974e45d45f
commit 6eb6509e45
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/ride/Ride.cpp
View File

@ -7175,9 +7175,9 @@ void determine_ride_entrance_and_exit_locations()
// Search the map to find it. Skip the outer ring of invisible tiles. // Search the map to find it. Skip the outer ring of invisible tiles.
bool alreadyFoundEntrance = false; bool alreadyFoundEntrance = false;
bool alreadyFoundExit = false; bool alreadyFoundExit = false;
for (uint8_t x = 1; x < MAXIMUM_MAP_SIZE_TECHNICAL - 1; x++) for (int32_t x = 1; x < MAXIMUM_MAP_SIZE_TECHNICAL - 1; x++)
{ {
for (uint8_t y = 1; y < MAXIMUM_MAP_SIZE_TECHNICAL - 1; y++) for (int32_t y = 1; y < MAXIMUM_MAP_SIZE_TECHNICAL - 1; y++)
{ {
TileElement* tileElement = map_get_first_element_at(TileCoordsXY{ x, y }.ToCoordsXY()); TileElement* tileElement = map_get_first_element_at(TileCoordsXY{ x, y }.ToCoordsXY());

24
test/testpaint/PaintIntercept.cpp
View File

@ -344,8 +344,8 @@ bool metal_b_supports_paint_setup(
} }
paint_struct* PaintAddImageAsParent( paint_struct* PaintAddImageAsParent(
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset) int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset)
{ {
return PaintIntercept::Paint6C( return PaintIntercept::Paint6C(
image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
@ -360,9 +360,9 @@ paint_struct* PaintAddImageAsParent(
} }
paint_struct* PaintAddImageAsParent( paint_struct* PaintAddImageAsParent(
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset, int32_t bound_box_offset_x,
int16_t bound_box_offset_y, int16_t bound_box_offset_z) int32_t bound_box_offset_y, int32_t bound_box_offset_z)
{ {
return PaintIntercept::PaintFull( return PaintIntercept::PaintFull(
PAINT_98197C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, PAINT_98197C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
@ -378,9 +378,9 @@ paint_struct* PaintAddImageAsChild(
} }
paint_struct* PaintAddImageAsOrphan( paint_struct* PaintAddImageAsOrphan(
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset, int32_t bound_box_offset_x,
int16_t bound_box_offset_y, int16_t bound_box_offset_z) int32_t bound_box_offset_y, int32_t bound_box_offset_z)
{ {
return PaintIntercept::PaintFull( return PaintIntercept::PaintFull(
PAINT_98198C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, PAINT_98198C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
@ -388,16 +388,16 @@ paint_struct* PaintAddImageAsOrphan(
} }
paint_struct* PaintAddImageAsChild( paint_struct* PaintAddImageAsChild(
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x, paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
int16_t bound_box_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x, int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset, int32_t bound_box_offset_x,
int16_t bound_box_offset_y, int16_t bound_box_offset_z) int32_t bound_box_offset_y, int32_t bound_box_offset_z)
{ {
return PaintIntercept::PaintFull( return PaintIntercept::PaintFull(
PAINT_98199C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset, PAINT_98199C, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
bound_box_offset_x, bound_box_offset_y, bound_box_offset_z, session->CurrentRotation); bound_box_offset_x, bound_box_offset_y, bound_box_offset_z, session->CurrentRotation);
} }
bool PaintAttachToPreviousPS(paint_session* session, uint32_t image_id, int16_t x, int16_t y) bool PaintAttachToPreviousPS(paint_session* session, uint32_t image_id, int32_t x, int32_t y)
{ {
return false; return false;
} }