mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #15317 from spacek531/more-no-platform
even fewer platforms
This commit is contained in:
commit
e62fabf607
|
@ -119,6 +119,20 @@ const uint32_t floorSpritesCork[] = {
|
|||
SPR_FLOOR_CORK
|
||||
};
|
||||
|
||||
const uint32_t floorSpritesMetal[] = {
|
||||
SPR_FLOOR_METAL,
|
||||
SPR_FLOOR_METAL,
|
||||
SPR_FLOOR_METAL,
|
||||
SPR_FLOOR_METAL
|
||||
};
|
||||
|
||||
const uint32_t floorSpritesMetalB[] = {
|
||||
SPR_FLOOR_METAL_B,
|
||||
SPR_FLOOR_METAL_B,
|
||||
SPR_FLOOR_METAL_B,
|
||||
SPR_FLOOR_METAL_B
|
||||
};
|
||||
|
||||
const uint32_t fenceSpritesRope[] = {
|
||||
SPR_FENCE_ROPE_NE,
|
||||
SPR_FENCE_ROPE_SE,
|
||||
|
@ -126,6 +140,14 @@ const uint32_t fenceSpritesRope[] = {
|
|||
SPR_FENCE_ROPE_NW
|
||||
};
|
||||
|
||||
const uint32_t fenceSpritesMetal[] = {
|
||||
SPR_FENCE_METAL_NE,
|
||||
SPR_FENCE_METAL_SE,
|
||||
SPR_FENCE_METAL_SW,
|
||||
SPR_FENCE_METAL_NW
|
||||
};
|
||||
|
||||
|
||||
const uint32_t fenceSpritesMetalB[] = {
|
||||
SPR_FENCE_METAL_B_NE,
|
||||
SPR_FENCE_METAL_B_SE,
|
||||
|
|
|
@ -240,8 +240,11 @@ enum
|
|||
};
|
||||
|
||||
extern const uint32_t floorSpritesCork[];
|
||||
extern const uint32_t floorSpritesMetal[];
|
||||
extern const uint32_t floorSpritesMetalB[];
|
||||
|
||||
extern const uint32_t fenceSpritesRope[];
|
||||
extern const uint32_t fenceSpritesMetal[];
|
||||
extern const uint32_t fenceSpritesMetalB[];
|
||||
|
||||
extern const uint32_t trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles[4][3];
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../object/StationObject.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/Supports.h"
|
||||
#include "../../util/Util.h"
|
||||
|
@ -47,6 +48,12 @@ static void paint_dodgems(
|
|||
|
||||
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]);
|
||||
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
uint32_t imageId = SPR_DODGEMS_FLOOR | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 30, 30, 1 }, { 1, 1, height });
|
||||
|
||||
|
@ -87,6 +94,7 @@ static void paint_dodgems(
|
|||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
paint_util_set_segment_support_height(session, SEGMENTS_ALL, height + 36, 0x20);
|
||||
paint_util_set_general_support_height(session, height + 48, 0x20);
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../object/StationObject.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/Supports.h"
|
||||
#include "../Track.h"
|
||||
|
@ -42,8 +43,15 @@ static void paint_flying_saucers(
|
|||
|
||||
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]);
|
||||
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
uint32_t imageId = SPR_FLYING_SAUCERS_FLOOR | session->TrackColours[SCHEME_TRACK];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 30, 30, 1 }, { 1, 1, height });
|
||||
}
|
||||
|
||||
if (ride != nullptr)
|
||||
{
|
||||
|
|
|
@ -94,8 +94,12 @@ static void paint_observation_tower_base(
|
|||
|
||||
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]);
|
||||
|
||||
uint32_t imageId = SPR_FLOOR_METAL_B | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 }, { 0, 0, height });
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
track_paint_util_paint_floor(
|
||||
session, edges, session->TrackColours[SCHEME_SUPPORTS], height, floorSpritesMetalB, stationObject);
|
||||
|
||||
if (ride != nullptr)
|
||||
{
|
||||
|
@ -106,7 +110,7 @@ static void paint_observation_tower_base(
|
|||
|
||||
if (trackSequence == 0)
|
||||
{
|
||||
imageId = SPR_OBSERVATION_TOWER_SEGMENT_BASE | session->TrackColours[SCHEME_TRACK];
|
||||
uint32_t imageId = SPR_OBSERVATION_TOWER_SEGMENT_BASE | session->TrackColours[SCHEME_TRACK];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 2, 2, 27 }, { 8, 8, height + 3 });
|
||||
|
||||
imageId = SPR_OBSERVATION_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK];
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../object/StationObject.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/Supports.h"
|
||||
#include "../Track.h"
|
||||
|
@ -201,8 +202,16 @@ static void paint_spiral_slide(
|
|||
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]);
|
||||
|
||||
// Base
|
||||
uint32_t imageId = ((direction & 1) ? SPIRAL_SLIDE_BASE_B : SPIRAL_SLIDE_BASE_A) | session->TrackColours[SCHEME_SUPPORTS];
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
uint32_t imageId = ((direction & 1) ? SPIRAL_SLIDE_BASE_B : SPIRAL_SLIDE_BASE_A)
|
||||
| session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 }, { 0, 0, height });
|
||||
}
|
||||
|
||||
if (ride != nullptr)
|
||||
{
|
||||
|
|
|
@ -24,9 +24,6 @@ enum
|
|||
SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT_TOP = 14566,
|
||||
};
|
||||
|
||||
static constexpr const uint32_t launched_freefall_fence_sprites[] = { SPR_FENCE_METAL_NE, SPR_FENCE_METAL_SE,
|
||||
SPR_FENCE_METAL_SW, SPR_FENCE_METAL_NW };
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006D5FAB
|
||||
|
@ -96,19 +93,23 @@ static void paint_launched_freefall_base(
|
|||
|
||||
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]);
|
||||
|
||||
uint32_t imageId = SPR_FLOOR_METAL | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 }, { 0, 0, height });
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
track_paint_util_paint_floor(
|
||||
session, edges, session->TrackColours[SCHEME_SUPPORTS], height, floorSpritesMetal, stationObject);
|
||||
|
||||
if (ride != nullptr)
|
||||
{
|
||||
track_paint_util_paint_fences(
|
||||
session, edges, session->MapPosition, trackElement, ride, session->TrackColours[SCHEME_TRACK], height,
|
||||
launched_freefall_fence_sprites, session->CurrentRotation);
|
||||
fenceSpritesMetal, session->CurrentRotation);
|
||||
}
|
||||
|
||||
if (trackSequence == 0)
|
||||
{
|
||||
imageId = SPR_LAUNCHED_FREEFALL_TOWER_BASE | session->TrackColours[SCHEME_TRACK];
|
||||
uint32_t imageId = SPR_LAUNCHED_FREEFALL_TOWER_BASE | session->TrackColours[SCHEME_TRACK];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 2, 2, 27 }, { 8, 8, height + 3 });
|
||||
|
||||
height += 32;
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../object/StationObject.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/Supports.h"
|
||||
#include "../../world/Entity.h"
|
||||
|
@ -237,9 +238,15 @@ static void paint_magic_carpet(
|
|||
metal_a_supports_paint_setup(
|
||||
session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
}
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
uint32_t imageId = SPR_STATION_BASE_D | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -106,8 +106,12 @@ static void paint_roto_drop_base(
|
|||
|
||||
wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]);
|
||||
|
||||
uint32_t imageId = SPR_FLOOR_METAL_B | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 }, { 0, 0, height });
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
track_paint_util_paint_floor(
|
||||
session, edges, session->TrackColours[SCHEME_SUPPORTS], height, floorSpritesMetalB, stationObject);
|
||||
|
||||
if (ride != nullptr)
|
||||
{
|
||||
|
@ -118,7 +122,7 @@ static void paint_roto_drop_base(
|
|||
|
||||
if (trackSequence == 0)
|
||||
{
|
||||
imageId = (direction & 1 ? SPR_ROTO_DROP_TOWER_BASE_90_DEG : SPR_ROTO_DROP_TOWER_BASE)
|
||||
uint32_t imageId = (direction & 1 ? SPR_ROTO_DROP_TOWER_BASE_90_DEG : SPR_ROTO_DROP_TOWER_BASE)
|
||||
| session->TrackColours[SCHEME_TRACK];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 2, 2, 27 }, { 8, 8, height + 3 });
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../object/StationObject.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/Supports.h"
|
||||
#include "../../world/Entity.h"
|
||||
|
@ -129,6 +130,10 @@ static void paint_swinging_inverter_ship(
|
|||
uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
|
||||
uint32_t imageId;
|
||||
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
if (relativeTrackSequence != 1 && relativeTrackSequence != 3)
|
||||
{
|
||||
if (direction & 1)
|
||||
|
@ -142,6 +147,8 @@ static void paint_swinging_inverter_ship(
|
|||
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
}
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
imageId = SPR_STATION_BASE_D | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
|
||||
|
||||
|
@ -165,6 +172,7 @@ static void paint_swinging_inverter_ship(
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ride != nullptr)
|
||||
{
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../object/StationObject.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/Supports.h"
|
||||
#include "../../world/Entity.h"
|
||||
|
@ -184,6 +185,10 @@ static void paint_swinging_ship(
|
|||
uint32_t imageId;
|
||||
bool hasFence;
|
||||
|
||||
StationObject* stationObject = nullptr;
|
||||
if (ride != nullptr)
|
||||
stationObject = ride_get_station_object(ride);
|
||||
|
||||
if (relativeTrackSequence == 1 || relativeTrackSequence == 4)
|
||||
{
|
||||
wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
|
@ -193,25 +198,34 @@ static void paint_swinging_ship(
|
|||
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
imageId = SPR_STATION_BASE_A_NW_SE | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
imageId = SPR_STATION_BASE_A_SW_NE | session->TrackColours[SCHEME_SUPPORTS];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 1 });
|
||||
}
|
||||
}
|
||||
|
||||
paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
|
||||
|
||||
if (stationObject != nullptr && !(stationObject->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS))
|
||||
{
|
||||
if (direction & 1)
|
||||
{
|
||||
if (relativeTrackSequence != 1 && relativeTrackSequence != 4)
|
||||
{
|
||||
hasFence = track_paint_util_has_fence(EDGE_NE, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
hasFence = track_paint_util_has_fence(
|
||||
EDGE_NE, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
if (relativeTrackSequence == 2)
|
||||
{
|
||||
imageId = (hasFence ? SPR_STATION_PLATFORM_BEGIN_FENCED_NW_SE : SPR_STATION_PLATFORM_BEGIN_NW_SE)
|
||||
|
@ -228,7 +242,8 @@ static void paint_swinging_ship(
|
|||
| session->TrackColours[SCHEME_TRACK];
|
||||
PaintAddImageAsParent(session, imageId, { 24, 0, height + 9 }, { 8, 32, 1 });
|
||||
|
||||
hasFence = track_paint_util_has_fence(EDGE_SW, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
hasFence = track_paint_util_has_fence(
|
||||
EDGE_SW, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
if (relativeTrackSequence == 3)
|
||||
{
|
||||
if (hasFence)
|
||||
|
@ -256,7 +271,8 @@ static void paint_swinging_ship(
|
|||
{
|
||||
if (relativeTrackSequence != 1 && relativeTrackSequence != 4)
|
||||
{
|
||||
hasFence = track_paint_util_has_fence(EDGE_NW, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
hasFence = track_paint_util_has_fence(
|
||||
EDGE_NW, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
if (relativeTrackSequence == 2)
|
||||
{
|
||||
imageId = (hasFence ? SPR_STATION_PLATFORM_BEGIN_FENCED_SW_NE : SPR_STATION_PLATFORM_BEGIN_SW_NE)
|
||||
|
@ -273,7 +289,8 @@ static void paint_swinging_ship(
|
|||
| session->TrackColours[SCHEME_TRACK];
|
||||
PaintAddImageAsParent(session, imageId, { 0, 24, height + 9 }, { 32, 8, 1 });
|
||||
|
||||
hasFence = track_paint_util_has_fence(EDGE_SE, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
hasFence = track_paint_util_has_fence(
|
||||
EDGE_SE, session->MapPosition, trackElement, ride, session->CurrentRotation);
|
||||
if (relativeTrackSequence == 3)
|
||||
{
|
||||
if (hasFence)
|
||||
|
@ -297,7 +314,7 @@ static void paint_swinging_ship(
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
switch (relativeTrackSequence)
|
||||
{
|
||||
case 1:
|
||||
|
|
Loading…
Reference in New Issue