Skip to content

Commit

Permalink
Some attempts
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gymnasiast
Gymnasiast committed Jan 25, 2024
1 parent be62aed commit 994d126
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/openrct2/ride/transport/MiniatureRailway.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ static void PaintMiniatureRailwayTrackLeftEighthToDiag(

bool isSupported = false;
bool isRightEighthToOrthog = trackElement.GetTrackType() == TrackElemType::RightEighthToOrthogonal;
// Right eighth to orthogonal calls this function but we do not want to have a support call for it
// Left eighth to orthogonal calls this function but we do not want to have a support call for it
// for track sequence 4
if (trackSequence != 4 || !isRightEighthToOrthog)
{
Expand Down Expand Up @@ -1761,9 +1761,9 @@ static constexpr bool miniature_railway_diag_image_segment[][4] = {

static constexpr std::optional<WoodenSupportSubType> _diagSupportTypes[NumOrthogonalDirections][4] = {
{ WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner2, WoodenSupportSubType::NeSw },
{ WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, WoodenSupportSubType::NwSe },
{ WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, WoodenSupportSubType::NwSe },
{ WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::NeSw },
{ WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, WoodenSupportSubType::NwSe },
{ WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, WoodenSupportSubType::NwSe },
};

struct FloorDescriptor
Expand Down Expand Up @@ -1972,10 +1972,10 @@ static void MiniatureRailwayTrackDiag25DegUpToFlat(
const TrackElement& trackElement)
{
static constexpr int8_t supportOffsets[][4] = {
{ 0, +8, +8, +8 },
{ 0, -8, -8, 0 },
{ 0, +8, +8, +8 },
{ 0, -8, -8, +8 },
{ +8, +8, +8, +8 },
{ +8, -8, -8, 0 },
{ +8, +8, +8, +8 },
{ +8, -8, -8, +8 },
};

bool hasSupports = false;
Expand Down Expand Up @@ -2010,10 +2010,10 @@ static void MiniatureRailwayTrackDiag25DegUpToFlat(
}

static constexpr int8_t offsetsB[4][4][2] = {
{ { 0, 0 }, { +8, +16 }, { +8, +8 }, { +8, +8 } },
{ { 0, 0 }, { -8, -8 }, { -8, -8 }, { +8, +8 } },
{ { 0, 0 }, { +8, +8 }, { +8, +16 }, { +8, +8 } },
{ { 0, 0 }, { -8, -8 }, { -8, -8 }, { +8, +8 } },
{ { 8, 8 }, { +8, +16 }, { +8, +8 }, { +8, +8 } },
{ { 8, 8 }, { -8, -8 }, { -8, -8 }, { +8, +8 } },
{ { 8, 8 }, { +8, +8 }, { +8, +16 }, { +8, +8 } },
{ { 8, 8 }, { -8, -8 }, { -8, -8 }, { +8, +8 } },
};

uint32_t imageId = miniature_railway_track_pieces_diag_25_deg_up_to_flat[direction];
Expand Down Expand Up @@ -2205,7 +2205,7 @@ static void MiniatureRailwayTrackDiag25DegDownToFlat(
uint32_t floorImage = 0;
CoordsXY floorBoundSize;
CoordsXY floorBoundOffset;
auto supportType = _diagSupportTypes[direction][trackSequence];
int16_t supportType = monorail_diag_support_types[direction][trackSequence];

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Windows (x64) 

'monorail_diag_support_types': undeclared identifier [D:\a\OpenRCT2\OpenRCT2\src\openrct2\libopenrct2.vcxproj]

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Windows (win32) using mingw 

‘monorail_diag_support_types’ was not declared in this scope

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Windows (win32) 

'monorail_diag_support_types': undeclared identifier [D:\a\OpenRCT2\OpenRCT2\src\openrct2\libopenrct2.vcxproj]

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Linux (x86_64, jammy, portable) 

'monorail_diag_support_types' was not declared in this scope

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Windows (arm64) 

'monorail_diag_support_types': undeclared identifier [D:\a\OpenRCT2\OpenRCT2\src\openrct2\libopenrct2.vcxproj]

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / macOS (x64) using CMake 

use of undeclared identifier 'monorail_diag_support_types'

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang 

use of undeclared identifier 'monorail_diag_support_types'

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Linux (Debug) using clang, coverage enabled 

use of undeclared identifier 'monorail_diag_support_types'

Check failure on line 2208 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / macOS (arm64) using CMake 

use of undeclared identifier 'monorail_diag_support_types'

if (supportType.has_value())

Check failure on line 2210 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Windows (win32) using mingw 

request for member ‘has_value’ in ‘supportType’, which is of non-class type ‘int16_t’ {aka ‘short int’}

Check failure on line 2210 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Linux (x86_64, jammy, portable) 

request for member 'has_value' in 'supportType', which is of non-class type 'int16_t' {aka 'short int'}

Check failure on line 2210 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / macOS (x64) using CMake 

member reference base type 'int16_t' (aka 'short') is not a structure or union

Check failure on line 2210 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang 

member reference base type 'int16_t' (aka 'short') is not a structure or union

Check failure on line 2210 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / Linux (Debug) using clang, coverage enabled 

member reference base type 'int16_t' (aka 'short') is not a structure or union

Check failure on line 2210 in src/openrct2/ride/transport/MiniatureRailway.cpp

View workflow job for this annotation

GitHub Actions / macOS (arm64) using CMake 

member reference base type 'int16_t' (aka 'short') is not a structure or union
{
Expand Down

0 comments on commit 994d126

Please sign in to comment.