mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Unhide terrain surfaces, terrain edges and stations; fix RCT1 surface import

Browse Source
This commit is contained in:
Gymnasiast
2020-02-08 18:54:56 +01:00
committed by Ted John
parent 79d1f06447
commit 76601ae7b2
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -104,11 +104,10 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = {
{ STR_OBJECT_SELECTION_PARK_ENTRANCE, SPR_TAB_PARK, false },
{ STR_OBJECT_SELECTION_WATER, SPR_TAB_WATER, false },
// Currently hidden until new save format arrives:
// { STR_OBJECT_SELECTION_TERRAIN_SURFACES, SPR_G2_TAB_LAND, false },
// { STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TAB_LAND, false },
// { STR_OBJECT_SELECTION_STATIONS, SPR_TAB_PARK, false },
// { STR_OBJECT_SELECTION_MUSIC, SPR_TAB_MUSIC_0, false },
{ STR_OBJECT_SELECTION_TERRAIN_SURFACES, SPR_G2_TAB_LAND, false },
{ STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TAB_LAND, false },
{ STR_OBJECT_SELECTION_STATIONS, SPR_TAB_PARK, false },
// { STR_OBJECT_SELECTION_MUSIC, SPR_TAB_MUSIC_0, false },
};
#pragma region Widgets

2
src/openrct2/object/ObjectLimits.h
View File

@@ -22,7 +22,7 @@ constexpr const uint16_t MAX_SCENERY_GROUP_OBJECTS = 19;
constexpr const uint16_t MAX_PARK_ENTRANCE_OBJECTS = 1;
constexpr const uint16_t MAX_WATER_OBJECTS = 1;
constexpr const uint16_t MAX_SCENARIO_TEXT_OBJECTS = 1;
constexpr const uint16_t MAX_TERRAIN_SURFACE_OBJECTS = 18;
constexpr const uint16_t MAX_TERRAIN_SURFACE_OBJECTS = 255;
constexpr const uint16_t MAX_TERRAIN_EDGE_OBJECTS = 255;
constexpr const uint16_t MAX_STATION_OBJECTS = 255;
constexpr const uint16_t MAX_MUSIC_OBJECTS = 255;

8
src/openrct2/rct1/S4Importer.cpp
View File

@@ -1513,6 +1513,14 @@ private:
}));
LoadObjects(ObjectType::ParkEntrance, std::vector<const char*>({ "PKENT1 " }));
LoadObjects(ObjectType::Water, _waterEntry);
LoadObjects(
ObjectType::TerrainSurface,
std::vector<const char*>({
"#RCT1SRR",
"#RCT1SWO",
"#RCT1SRU",
"#RCT1SRG",
}));
}
void LoadObjects(ObjectType objectType, const EntryList& entries)

1
src/openrct2/world/Surface.h
View File

@@ -36,6 +36,7 @@ enum
TERRAIN_ROOF_IRON,
TERRAIN_ROOF_LOG,
TERRAIN_COUNT_REGULAR, // The amount of surface types the user can actually select - what follows are technical types
// Technical types (not selectable)
TERRAIN_CHECKERBOARD_INVERTED = TERRAIN_COUNT_REGULAR,
TERRAIN_UNDERGROUND_VIEW,
};