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

Merge pull request #2682 from Gymnasiast/clear-scenery-zc 

Don't remove walls when raising/lowering land/water, fixes #2681
This commit is contained in:
Ted John 2016-01-09 22:58:41 +00:00
parent 3f70a3f4f0 03c35ab0b6
commit 9bb6aba2b3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/world/map.c
View File

@ -1601,7 +1601,8 @@ static money32 map_set_land_height(int flags, int x, int y, int height, int styl
if(flags & GAME_COMMAND_FLAG_APPLY)
{
footpath_remove_litter(x, y, map_element_height(x, y));
map_remove_walls_at(x, y, height * 8 - 16, height * 8 + 32);
if(!gCheatsDisableClearanceChecks)
map_remove_walls_at(x, y, height * 8 - 16, height * 8 + 32);
}
RCT2_GLOBAL(0x9E2E18, money32) += MONEY(20, 0);
@ -2498,7 +2499,8 @@ void game_command_set_water_height(int* eax, int* ebx, int* ecx, int* edx, int*
if(*ebx & GAME_COMMAND_FLAG_APPLY){
int element_height = map_element_height(x, y);
footpath_remove_litter(x, y, element_height);
map_remove_walls_at_z(x, y, element_height);
if(!gCheatsDisableClearanceChecks)
map_remove_walls_at_z(x, y, element_height);
}
rct_map_element* map_element = map_get_surface_element_at(x / 32, y / 32);