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

Fix #8498: Advertisement campaigns less effective than they used to be

Browse Source 
0x8000 was being checked instead of 0xFFFF when importing and exporting peep spawns to and from S4, S6.
This commit is contained in:
Ted John
2018-12-20 09:25:31 +00:00
parent 4430784326
commit 92bb4a5897
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1789,7 +1789,7 @@ private:
gPeepSpawns.clear();
for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
{
if (_s4.peep_spawn[i].x != (uint16_t)LOCATION_NULL)
if (_s4.peep_spawn[i].x != PEEP_SPAWN_UNDEFINED)
{
PeepSpawn spawn = { _s4.peep_spawn[i].x, _s4.peep_spawn[i].y, _s4.peep_spawn[i].z * 16,
_s4.peep_spawn[i].direction };

2
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -438,7 +438,7 @@ void S6Exporter::ExportPeepSpawns()
}
else
{
_s6.peep_spawns[i] = { (uint16_t)LOCATION_NULL, (uint16_t)LOCATION_NULL, 0, 0 };
_s6.peep_spawns[i] = { PEEP_SPAWN_UNDEFINED, PEEP_SPAWN_UNDEFINED, 0, 0 };
}
}
}

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

@@ -836,7 +836,7 @@ public:
gPeepSpawns.clear();
for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
{
if (_s6.peep_spawns[i].x != (uint16_t)LOCATION_NULL)
if (_s6.peep_spawns[i].x != PEEP_SPAWN_UNDEFINED)
{
PeepSpawn spawn = { _s6.peep_spawns[i].x, _s6.peep_spawns[i].y, _s6.peep_spawns[i].z * 16,
_s6.peep_spawns[i].direction };