mirror of https://github.com/OpenRCT2/OpenRCT2.git
Remove testpaint modifications
This commit is contained in:
parent
60f72c6f8e
commit
2989ef6ccd
|
@ -40,8 +40,8 @@ ride_id_t gTrackDesignSaveRideIndex = RIDE_ID_NULL;
|
||||||
uint8_t gClipHeight = 255;
|
uint8_t gClipHeight = 255;
|
||||||
CoordsXY gClipSelectionA = { 0, 0 };
|
CoordsXY gClipSelectionA = { 0, 0 };
|
||||||
CoordsXY gClipSelectionB = { MAXIMUM_TILE_START_XY, MAXIMUM_TILE_START_XY };
|
CoordsXY gClipSelectionB = { MAXIMUM_TILE_START_XY, MAXIMUM_TILE_START_XY };
|
||||||
|
uint32_t gScenarioTicks;
|
||||||
uint8_t gCurrentRotation;
|
uint8_t gCurrentRotation;
|
||||||
uint32_t gCurrentTicks;
|
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
constexpr const std::array<CoordsXY, 8> CoordsDirectionDelta = {
|
constexpr const std::array<CoordsXY, 8> CoordsDirectionDelta = {
|
||||||
|
@ -887,11 +887,6 @@ void TileElementBase::SetOwner(uint8_t newOwner)
|
||||||
owner |= (newOwner & OWNER_MASK);
|
owner |= (newOwner & OWNER_MASK);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TileElementBase::IsInvisible() const
|
|
||||||
{
|
|
||||||
return (this->Flags & TILE_ELEMENT_FLAG_INVISIBLE) != 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace OpenRCT2
|
namespace OpenRCT2
|
||||||
{
|
{
|
||||||
IContext* GetContext()
|
IContext* GetContext()
|
||||||
|
|
|
@ -344,8 +344,8 @@ bool metal_b_supports_paint_setup(
|
||||||
}
|
}
|
||||||
|
|
||||||
paint_struct* PaintAddImageAsParent(
|
paint_struct* PaintAddImageAsParent(
|
||||||
paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
|
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_x,
|
||||||
int32_t bound_box_length_y, int32_t bound_box_length_z, int32_t z_offset)
|
int16_t bound_box_length_y, int8_t bound_box_length_z, int16_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, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
|
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_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_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x,
|
||||||
int32_t bound_box_offset_y, int32_t bound_box_offset_z)
|
int16_t bound_box_offset_y, int16_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,
|
||||||
|
@ -387,9 +387,9 @@ paint_struct* PaintAddImageAsChild(
|
||||||
}
|
}
|
||||||
|
|
||||||
paint_struct* PaintAddImageAsOrphan(
|
paint_struct* PaintAddImageAsOrphan(
|
||||||
paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
|
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_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_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x,
|
||||||
int32_t bound_box_offset_y, int32_t bound_box_offset_z)
|
int16_t bound_box_offset_y, int16_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,
|
||||||
|
@ -397,16 +397,16 @@ paint_struct* PaintAddImageAsOrphan(
|
||||||
}
|
}
|
||||||
|
|
||||||
paint_struct* PaintAddImageAsChild(
|
paint_struct* PaintAddImageAsChild(
|
||||||
paint_session* session, uint32_t image_id, int32_t x_offset, int32_t y_offset, int32_t bound_box_length_x,
|
paint_session* session, uint32_t image_id, int8_t x_offset, int8_t y_offset, int16_t bound_box_length_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_length_y, int8_t bound_box_length_z, int16_t z_offset, int16_t bound_box_offset_x,
|
||||||
int32_t bound_box_offset_y, int32_t bound_box_offset_z)
|
int16_t bound_box_offset_y, int16_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, int32_t x, int32_t y)
|
bool PaintAttachToPreviousPS(paint_session* session, uint32_t image_id, int16_t x, int16_t y)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,6 +64,7 @@ namespace TestPaint
|
||||||
|
|
||||||
RCT2_CurrentViewportFlags = 0;
|
RCT2_CurrentViewportFlags = 0;
|
||||||
|
|
||||||
|
gScenarioTicks = 0;
|
||||||
RCT2_ScenarioTicks = 0;
|
RCT2_ScenarioTicks = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue