Only add RCT1 land objects to imported SV6 if they are used

[duncanspumpkin]

We were mistakenly loading rct1 surfaces and sides when loading rct2 parks leading to a confusing ui.

[Gymnasiast]

No, this is NOT a mistake. We added the RCT1 sides to SV6 files years ago (#7010), and the surfaces one year ago. So they have to be loaded. Otherwise this is going to break thousands of SV6 files created with OpenRCT2 in the past years.

Also, there is code to hide the surfaces and edges if they are not loaded. (Might be broken.)

[Gymnasiast]

Shooting the messenger now, are we? Try loading this park on develop and on this PR: Pickle Park-savetest.sv6.zip

How it looks on develop:

How it looks with this PR:

So, this PR does break SV6 files, like I mentioned. Whether you like it or not, we have supported extra land types for three years in SV6 and we can’t just retroactively remove that support, because it would break thousands of SV6 files that people created with OpenRCT2.

[pizza2004]

We added the RCT1 sides to SV6 files years ago (#7010), and the surfaces one year ago. So they have to be loaded.

Couldn't you just add a check to see if they're saved in the SV6 file and if not just not load them as defaults?

[Gymnasiast]

We added the RCT1 sides to SV6 files years ago (#7010), and the surfaces one year ago. So they have to be loaded.

Couldn't you just add a check to see if they're saved in the SV6 file and if not just not load them as defaults?

That would work, but it’s not what this PR currently does.

[Gymnasiast]

The modified version does not work correctly:

Oddly, it seems to add the red roof tiles (a terrain surface) as an edge style. Perhaps it’s going past the end of an array?

[duncanspumpkin]

Okay think thats it fixed

obviously doesn't look correct on mine since i don't have RCT1 linked but its showing as the brick edge.

[duncanspumpkin]

Hmm looks like there are still a few places with hardcoded offsets:

static uint32_t get_surface_image(
    const paint_session* session, ObjectEntryIndex index, int32_t offset, uint8_t rotation, int32_t grassLength, bool grid,
    bool underground)
{
    // Provide fallback for RCT1 surfaces if the user does have RCT1 linked.
    if (!is_csg_loaded() && index >= TERRAIN_RCT2_COUNT)
    {
        if (index == TERRAIN_ROOF_GREY)
            index = TERRAIN_ROCK;
        else
            index = TERRAIN_DIRT;
    }

[Gymnasiast]

Hmm looks like there are still a few places with hardcoded offsets:

We should be able to get of those once I implement the "no csg" fallback.

[Gymnasiast]

Ok, I just tested with a few more SV4 files and hybrid SV6 files.

It looks a bit messy that the selection of land types varies for every hybrid save. The order can also be odd:

What I would propose as a solution is this: check if the file uses any RCT1 land texture. If it does, load all of them, and in the same order as we do currently. If none of used, only load the RCT2 textures.

[duncanspumpkin]

Ok, I just tested with a few more SV4 files and hybrid SV6 files.

It looks a bit messy that the selection of land types varies for every hybrid save. The order can also be odd:

What I would propose as a solution is this: check if the file uses any RCT1 land texture. If it does, load all of them, and in the same order as we do currently. If none of used, only load the RCT2 textures.

Can you try the latest version it now looks at all the tiles if there are any rct1 land or edges it will load all rct1 land and edges into the file. Saves having to recompute the index as well.

[astraylife1]

After this fix, how are we to obtain the RCT1 sides? The castle and urban sides as well as others don't show up in object selection now. I can't figure out how to add those textures to my park

[Gymnasiast]

After this fix, how are we to obtain the RCT1 sides? The castle and urban sides as well as others don't show up in object selection now. I can't figure out how to add those textures to my park

If they don’t show up in your Object Selection window, then you should probably check if your filters are set correctly. There is a button for those in the top right of the Object Selection window.

[astraylife1]

After this fix, how are we to obtain the RCT1 sides? The castle and urban sides as well as others don't show up in object selection now. I can't figure out how to add those textures to my park

If they don’t show up in your Object Selection window, then you should probably check if your filters are set correctly. There is a button for those in the top right of the Object Selection window.

Silly mistake! You are correct. Apparently I had LL and CF checked off. Thanks!