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

Implement redraw_peep_and_rain

This commit is contained in:
Sijmen Schoon 2014-10-20 23:20:13 +02:00
parent 3eff85bc34
commit a7b1e50a92
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/drawing/drawing.c
View File

@ -475,4 +475,41 @@ void gfx_draw_rain(int left, int top, int width, int height, sint32 x_start, sin
pattern_y_pos++;
pattern_y_pos %= pattern_y_space;
}
}
}
/**
*
* rct2: 0x006843DC
*/
void redraw_peep_and_rain()
{
if (RCT2_GLOBAL(0x009ABDF2, uint32) != 0) {
int sprite = RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_SPRITE, sint32);
if (sprite != -1) {
sprite = (sprite & 0x7FFFF) * 16;
rct_g1_element *g1_elements = RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS, rct_g1_element);
int left = RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_X, sint32) + g1_elements[sprite].x_offset;
int top = RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_Y, sint32) + g1_elements[sprite].y_offset;
int right = left + g1_elements[sprite].width;
int bottom = top + g1_elements[sprite].height;
gfx_set_dirty_blocks(left, top, right, bottom);
}
if (RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32) == 0) {
return;
}
uint8 *screen_pixels = (int *)RCT2_ADDRESS(RCT2_ADDRESS_SCREEN_DPI, rct_drawpixelinfo)->bits;
uint32 *rain_pixels = RCT2_ADDRESS(RCT2_ADDRESS_RAIN_PIXEL_STORE, uint32);
int rain_no_pixels = RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32);
if (rain_pixels) {
for (int i = 0; i < rain_no_pixels; i++) {
uint32 pixel = rain_pixels[i];
screen_pixels[pixel >> 8] = pixel & 0xFF;
}
RCT2_GLOBAL(0x009E2C78, uint32) = 1;
}
RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32) = 0;
}
}

1
src/drawing/drawing.h
View File

@ -115,5 +115,6 @@ void draw_string_right_underline(rct_drawpixelinfo *dpi, int format, void *args,
// rain
void update_rain_animation();
void redraw_peep_and_rain();
#endif

2
src/game.c
View File

@ -190,7 +190,7 @@ void game_update()
int i, numUpdates, tmp;
// Handles picked-up peep and rain redraw
RCT2_CALLPROC_EBPSAFE(0x006843DC);
redraw_peep_and_rain();
// 0x006E3AEC // screen_game_process_mouse_input();
// RCT2_CALLPROC_EBPSAFE(0x006E3AEC); // screen_game_process_keyboard_input();

2
src/interface/screenshot.c
View File

@ -52,7 +52,7 @@ void screenshot_check()
window_error_open(screenshotIndex == -1 ? STR_SCREENSHOT_FAILED : STR_SCREENSHOT_SAVED_AS, -1);
RCT2_GLOBAL(0x009A8C29, uint8) &= ~1;
RCT2_CALLPROC_EBPSAFE(0x006843DC);
redraw_peep_and_rain();
}
}
}