mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #7065: Guests cannot enter Great Wall Of China scenario

This commit is contained in:
Gymnasiast 2018-01-23 19:03:00 +01:00
parent f1400a16d7
commit 2c8ab6fb68
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/openrct2/rct2/S6Importer.cpp
View File

@ -766,28 +766,21 @@ public:
if (String::Equals(_s6.scenario_filename, "WW South America - Rio Carnival.SC6") || if (String::Equals(_s6.scenario_filename, "WW South America - Rio Carnival.SC6") ||
String::Equals(_s6.scenario_filename, "South America - Rio Carnival.SC6")) String::Equals(_s6.scenario_filename, "South America - Rio Carnival.SC6"))
{ {
gPeepSpawns[0] = { 2160, 3167, 6, 1 }; _s6.peep_spawns[0] = { 2160, 3167, 6, 1 };
_s6.peep_spawns[1].x = PEEP_SPAWN_UNDEFINED;
for (size_t i = 1; i < MAX_PEEP_SPAWNS; i++)
{
gPeepSpawns[i].x = PEEP_SPAWN_UNDEFINED;
} }
} // In this park, gPeepSpawns[0] is correct. Just clear the other.
// In this park, gPeepSpawns[0] is correct. Just clear the rest.
else if (String::Equals(_s6.scenario_filename, "Great Wall of China Tourism Enhancement.SC6") || else if (String::Equals(_s6.scenario_filename, "Great Wall of China Tourism Enhancement.SC6") ||
String::Equals(_s6.scenario_filename, "Asia - Great Wall of China Tourism Enhancement.SC6")) String::Equals(_s6.scenario_filename, "Asia - Great Wall of China Tourism Enhancement.SC6"))
{ {
for (size_t i = 1; i < MAX_PEEP_SPAWNS; i++) _s6.peep_spawns[1].x = PEEP_SPAWN_UNDEFINED;
{
gPeepSpawns[i].x = PEEP_SPAWN_UNDEFINED;
}
}
else
{
// Amity Airfield has peeps entering from the corner of the tile, instead of the middle.
if (String::Equals(_s6.scenario_filename, "Amity Airfield.SC6"))
_s6.peep_spawns[0].y = 1296;
}
// Amity Airfield has peeps entering from the corner of the tile, instead of the middle.
else if (String::Equals(_s6.scenario_filename, "Amity Airfield.SC6"))
{
_s6.peep_spawns[0].y = 1296;
}
for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++) for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
{ {
@ -799,8 +792,6 @@ public:
gPeepSpawns[i].x = PEEP_SPAWN_UNDEFINED; gPeepSpawns[i].x = PEEP_SPAWN_UNDEFINED;
} }
} }
}
}; };
IParkImporter * ParkImporter::CreateS6(IObjectRepository * objectRepository, IObjectManager * objectManager) IParkImporter * ParkImporter::CreateS6(IObjectRepository * objectRepository, IObjectManager * objectManager)