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

Fix nullptr access when removing banners

Browse Source
This commit is contained in:
Ted John
2017-02-04 11:23:55 +00:00
parent b1ffe19a74
commit 94bde929e7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/world/map.c
View File

@@ -1092,6 +1092,10 @@ void game_command_remove_banner(sint32* eax, sint32* ebx, sint32* ecx, sint32* e
rct_banner *banner = &gBanners[map_element->properties.banner.index];
rct_scenery_entry *scenery_entry = get_banner_entry(banner->type);
money32 refund = 0;
if (scenery_entry != NULL || scenery_entry != (rct_scenery_entry *)-1) {
refund = -((scenery_entry->banner.price * 3) / 4);
}
if (flags & GAME_COMMAND_FLAG_APPLY) {
if (gGameCommandNestLevel == 1 && !(*ebx & GAME_COMMAND_FLAG_GHOST)) {
@@ -1107,9 +1111,8 @@ void game_command_remove_banner(sint32* eax, sint32* ebx, sint32* ecx, sint32* e
map_element_remove(map_element);
}
*ebx = (scenery_entry->banner.price * -3) / 4;
if(gParkFlags & PARK_FLAGS_NO_MONEY){
*ebx = refund;
if (gParkFlags & PARK_FLAGS_NO_MONEY) {
*ebx = 0;
}
}