mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity

Fix all known incorrect land ownership in RCT1

Browse Source
This commit is contained in:
Michael Steenbeek
2017-02-02 22:21:05 +01:00
committed by GitHub
parent cad39c788a
commit 695f7c33bf
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2356,21 +2356,42 @@ private:
void FixLandOwnership()
{
rct_map_element * currentElement;
switch(_s4.scenario_slot_index) {
case SC_KATIES_DREAMLAND:
currentElement = map_get_surface_element_at(74, 70);
currentElement->properties.surface.ownership |= OWNERSHIP_AVAILABLE;
currentElement = map_get_surface_element_at(75, 70);
currentElement->properties.surface.ownership |= OWNERSHIP_AVAILABLE;
currentElement = map_get_surface_element_at(76, 70);
currentElement->properties.surface.ownership |= OWNERSHIP_AVAILABLE;
currentElement = map_get_surface_element_at(77, 73);
currentElement->properties.surface.ownership |= OWNERSHIP_AVAILABLE;
currentElement = map_get_surface_element_at(80, 77);
currentElement->properties.surface.ownership |= OWNERSHIP_AVAILABLE;
switch (_s4.scenario_slot_index) {
case SC_DYNAMITE_DUNES:
FixLandOwnershipTiles({ {97, 18}, {99, 19}, {83, 34} });
break;
case SC_LEAFY_LAKE:
FixLandOwnershipTiles({ {49, 66} });
break;
case SC_KATIES_DREAMLAND:
FixLandOwnershipTiles({ {74, 70}, {75, 70}, {76, 70}, {77, 73}, {80, 77} });
break;
case SC_POKEY_PARK:
FixLandOwnershipTiles({ {64, 102} });
break;
case SC_MYSTIC_MOUNTAIN:
FixLandOwnershipTiles({ {98, 69}, {98, 70}, {103, 64}, {53, 79}, {86, 93}, {87, 93} });
break;
case SC_PACIFIC_PYRAMIDS:
FixLandOwnershipTiles({ {93, 105}, {63, 34}, {76, 25}, {85, 31}, {96, 47}, {96, 48} });
break;
case SC_UTOPIA:
FixLandOwnershipTiles({ {85, 73} });
break;
case SC_URBAN_PARK:
FixLandOwnershipTiles({ {64, 77}, {61, 66}, {61, 67}, {39, 20} });
break;
}
}
void FixLandOwnershipTiles(std::initializer_list<rct_xy8> tiles)
{
rct_map_element * currentElement;
for (const rct_xy8 * tile = tiles.begin(); tile != tiles.end(); ++tile)
{
currentElement = map_get_surface_element_at((*tile).x, (*tile).y);
currentElement->properties.surface.ownership |= OWNERSHIP_AVAILABLE;
}
}

2
src/openrct2/scenario/ScenarioSources.cpp
View File

@@ -62,7 +62,7 @@ namespace ScenarioSources
{
{ SC_FOREST_FRONTIERS, "Forest Frontiers", SCENARIO_CATEGORY_BEGINNER },
{ SC_DYNAMITE_DUNES, "Dynamite Dunes", SCENARIO_CATEGORY_BEGINNER },
{ SC_LEAFY_LAKES, "Leafy Lake", SCENARIO_CATEGORY_BEGINNER },
{ SC_LEAFY_LAKE, "Leafy Lake", SCENARIO_CATEGORY_BEGINNER },
{ SC_DIAMOND_HEIGHTS, "Diamond Heights", SCENARIO_CATEGORY_BEGINNER },
{ SC_EVERGREEN_GARDENS, "Evergreen Gardens", SCENARIO_CATEGORY_BEGINNER },
{ SC_BUMBLY_BEACH, "Bumbly Beach", SCENARIO_CATEGORY_BEGINNER },

2
src/openrct2/scenario/ScenarioSources.h
View File

@@ -59,7 +59,7 @@ enum
// RCT
SC_FOREST_FRONTIERS = 0,
SC_DYNAMITE_DUNES,
SC_LEAFY_LAKES,
SC_LEAFY_LAKE,
SC_DIAMOND_HEIGHTS,
SC_EVERGREEN_GARDENS,
SC_BUMBLY_BEACH,