From 9eed7dc6142189c9777065a4aac1ef154bce880f Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Sun, 17 May 2015 12:38:02 -0400 Subject: [PATCH] renamed functions renamed gfx_invalidate_scrollingtext to gfx_invalidate_tile_if_zoomed --- src/drawing/drawing.c | 2 +- src/drawing/drawing.h | 2 +- src/peep/peep.c | 8 ++++---- src/ride/ride.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c index d1ba7ec55a..901af71bdf 100644 --- a/src/drawing/drawing.c +++ b/src/drawing/drawing.c @@ -185,7 +185,7 @@ void load_palette(){ * @param base_height (di) * @param clearance_height (si) */ -void gfx_invalidate_scrollingtext(int x, int y, int base_height, int clearance_height) +void gfx_invalidate_tile_if_zoomed(int x, int y, int base_height, int clearance_height) { x += 16; y += 16; diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index 61b335ac9c..8b24d08386 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -69,7 +69,7 @@ rct_drawpixelinfo* clip_drawpixelinfo(rct_drawpixelinfo* dpi, int left, int widt void gfx_set_dirty_blocks(int left, int top, int right, int bottom); void gfx_draw_all_dirty_blocks(); void gfx_redraw_screen_rect(short left, short top, short right, short bottom); -void gfx_invalidate_scrollingtext(int x, int y, int base_height, int clearance_height); +void gfx_invalidate_tile_if_zoomed(int x, int y, int base_height, int clearance_height); void gfx_invalidate_screen(); // palette diff --git a/src/peep/peep.c b/src/peep/peep.c index 779273b61a..a468b8dd6a 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -2764,7 +2764,7 @@ static void peep_update_mowing(rct_peep* peep){ if ((map_element->properties.surface.terrain & MAP_ELEMENT_SURFACE_TERRAIN_MASK) == (TERRAIN_GRASS << 5)){ map_element->properties.surface.grass_length = 0; - gfx_invalidate_scrollingtext(peep->next_x, peep->next_y, map_element->base_height * 8, map_element->base_height * 8 + 16); + gfx_invalidate_tile_if_zoomed(peep->next_x, peep->next_y, map_element->base_height * 8, map_element->base_height * 8 + 16); } peep->staff_lawns_mown++; peep->var_45 |= (1 << 5); @@ -2814,7 +2814,7 @@ static void peep_update_watering(rct_peep* peep){ continue; map_element->properties.scenery.age = 0; - gfx_invalidate_scrollingtext(x, y, map_element->base_height * 8, map_element->clearance_height * 8); + gfx_invalidate_tile_if_zoomed(x, y, map_element->base_height * 8, map_element->clearance_height * 8); peep->staff_gardens_watered++; peep->var_45 |= (1 << 4); } while (!map_element_is_last_for_tile(map_element++)); @@ -2884,7 +2884,7 @@ static void peep_update_emptying_bin(rct_peep* peep){ map_element->properties.path.addition_status |= ((3 << peep->var_37) << peep->var_37); - gfx_invalidate_scrollingtext(peep->next_x, peep->next_y, map_element->base_height * 8, map_element->clearance_height * 8); + gfx_invalidate_tile_if_zoomed(peep->next_x, peep->next_y, map_element->base_height * 8, map_element->clearance_height * 8); peep->staff_bins_emptied++; peep->var_45 |= (1 << 4); @@ -3537,7 +3537,7 @@ static void peep_update_using_bin(rct_peep* peep){ // Then placeing the new value. map_element->properties.path.addition_status |= rubbish_in_bin << selected_bin; - gfx_invalidate_scrollingtext(peep->next_x, peep->next_y, map_element->base_height << 3, map_element->clearance_height << 3); + gfx_invalidate_tile_if_zoomed(peep->next_x, peep->next_y, map_element->base_height << 3, map_element->clearance_height << 3); peep_state_reset(peep); } } diff --git a/src/ride/ride.c b/src/ride/ride.c index 387bdcecd0..eb23cd849b 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -1415,7 +1415,7 @@ static void ride_spiral_slide_update(rct_ride *ride) x += RCT2_GLOBAL(0x0098DDB8 + (rotation * 4), sint16); y += RCT2_GLOBAL(0x0098DDBA + (rotation * 4), sint16); - gfx_invalidate_scrollingtext(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); + gfx_invalidate_tile_if_zoomed(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } }