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

Fix bugs in scenery_clear update 

Note make a new version of land update to fix cost issue
This commit is contained in:
Duncan Frost 2015-05-26 17:55:25 +01:00
parent 54a37edb44
commit 573a632e43
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/windows/park.c
View File

@ -814,6 +814,7 @@ static void window_park_entrance_toolupdate()
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
// Create a new version for this instance as scenery_clear is silly for this
RCT2_CALLPROC_X(0x0068E213, x, y, 0, widgetIndex, (int)w, 0, 0);
RCT2_GLOBAL(0x00F1AD62, uint32) = game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),

16
src/windows/top_toolbar.c
View File

@ -1539,7 +1539,7 @@ static void window_top_toolbar_scenery_tool_down(short x, short y, rct_window* w
*
* rct2: 0x0068E213
*/
void sub_68E213(sint16 x, sint16 y){
void top_toolbar_tool_update_scenery_clear(sint16 x, sint16 y){
map_invalidate_selection_rect();
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~(1 << 0);
@ -1550,8 +1550,8 @@ void sub_68E213(sint16 x, sint16 y){
if (RCT2_GLOBAL(0x00F1AD62, money32) != MONEY32_UNDEFINED){
RCT2_GLOBAL(0x00F1AD62, money32) = MONEY32_UNDEFINED;
window_invalidate_by_class(WC_CLEAR_SCENERY);
return;
}
return;
}
uint8 state_changed = 0;
@ -1606,10 +1606,10 @@ void sub_68E213(sint16 x, sint16 y){
return;
money32 cost = map_clear_scenery(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, sint16) / 32,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, sint16) / 32,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, sint16) / 32,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, sint16) / 32,
0);
if (RCT2_GLOBAL(0x00F1AD62, money32) != cost){
@ -1633,11 +1633,11 @@ static void window_top_toolbar_tool_update()
switch (widgetIndex){
case WIDX_CLEAR_SCENERY:
sub_68E213(x, y);
top_toolbar_tool_update_scenery_clear(x, y);
break;
case WIDX_LAND:
if (LandPaintMode)
// Use the method that allows dragging the selection area
// Create a new version for this instance as scenery_clear is silly for this
RCT2_CALLPROC_X(0x0068E213, x, y, 0, widgetIndex, (int)w, 0, 0);
else
RCT2_CALLPROC_X(0x00664280, x, y, 0, widgetIndex, (int)w, 0, 0);

6
src/world/map.c
View File

@ -1732,6 +1732,12 @@ void game_command_remove_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi,
return;
}
}
if (!(*ebx & GAME_COMMAND_FLAG_APPLY)){
*ebx = 0;
return;
}
rct_scenery_entry* scenery_entry = RCT2_ADDRESS(RCT2_ADDRESS_WALL_SCENERY_ENTRIES, rct_scenery_entry*)[map_element->properties.fence.type];
if(scenery_entry->wall.var_0D != 0xFF){
rct_banner* banner = &gBanners[map_element->properties.fence.item[0]];