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

Merge pull request #8672 from Xkeeper0/i/8662 

Fix for #8662 paint_haunted_house_structure crash
This commit is contained in:
Duncan 2019-02-06 07:46:57 +00:00 committed by GitHub
parent 2cf4a9afb5 2828cbb2fc
commit 57471edc47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/ride/gentle/FerrisWheel.cpp
View File

@ -57,6 +57,11 @@ static void paint_ferris_wheel_structure(
Ride* ride = get_ride(rideIndex);
rct_ride_entry* rideEntry = get_ride_entry(ride->subtype);
rct_vehicle* vehicle = nullptr;
if (rideEntry == nullptr)
{
log_error("Error drawing Ferris Wheel, rideEntry is NULL.");
return;
}
int8_t xOffset = !(direction & 1) ? axisOffset : 0;
int8_t yOffset = (direction & 1) ? axisOffset : 0;

5
src/openrct2/ride/gentle/HauntedHouse.cpp
View File

@ -41,6 +41,11 @@ static void paint_haunted_house_structure(
Ride* ride = get_ride(rideIndex);
rct_ride_entry* rideEntry = get_ride_entry(ride->subtype);
if (rideEntry == nullptr)
{
log_error("Error drawing haunted house, rideEntry is NULL.");
return;
}
uint32_t baseImageId = rideEntry->vehicles[0].base_image_id;
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL)

3
src/openrct2/world/MapAnimation.cpp
View File

@ -185,6 +185,9 @@ static bool map_animation_invalidate_small_scenery(int32_t x, int32_t y, int32_t
continue;
sceneryEntry = tileElement->AsSmallScenery()->GetEntry();
if (sceneryEntry == nullptr)
continue;
if (scenery_small_entry_has_flag(
sceneryEntry,
SMALL_SCENERY_FLAG_FOUNTAIN_SPRAY_1 | SMALL_SCENERY_FLAG_FOUNTAIN_SPRAY_4 | SMALL_SCENERY_FLAG_SWAMP_GOO