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

Update rain pixels to use own global variable

Browse Source
This commit is contained in:
halfbro
2014-12-04 00:51:58 -05:00
parent 47a307d50a
commit 242bee9a07
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/addresses.h
View File

@@ -213,6 +213,7 @@
//Every pixel changed by rain is stored.
//32bit (pixel_offset 24 bit)(pixel_colour 8 bit)
//Use the rainPixels[] global in drawing.c from now on
#define RCT2_ADDRESS_RAIN_PIXEL_STORE 0x00EDF850
#define RCT2_ADDRESS_UNCOMPLETED_RESEARCH_TYPES 0x00EE787C

6
src/drawing/drawing.c
View File

@@ -37,6 +37,8 @@ int gLastDrawStringY;
uint8 _screenDirtyBlocks[5120];
uint32 rainPixels[0x4000];
//Originally 0x9ABE0C, 12 elements from 0xF3 are the peep top colour, 12 elements from 0xCA are peep trouser colour
const uint8 peep_palette[0x100] = {
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
@@ -444,7 +446,7 @@ void gfx_draw_rain(int left, int top, int width, int height, sint32 x_start, sin
uint8 pattern_y_pos = pattern_start_y_offset % pattern_y_space;
//Stores the colours of changed pixels
uint32* pixel_store = RCT2_ADDRESS(RCT2_ADDRESS_RAIN_PIXEL_STORE, uint32);
uint32* pixel_store = rainPixels;
pixel_store += RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32);
for (; height != 0; height--){
@@ -505,7 +507,7 @@ void redraw_peep_and_rain()
rct_window *window = window_get_main();
uint32 numPixels = window->width * window->height;
uint32 *rain_pixels = RCT2_ADDRESS(RCT2_ADDRESS_RAIN_PIXEL_STORE, uint32);
uint32 *rain_pixels = rainPixels;
if (rain_pixels) {
uint8 *screen_pixels = RCT2_ADDRESS(RCT2_ADDRESS_SCREEN_DPI, rct_drawpixelinfo)->bits;
for (int i = 0; i < rain_no_pixels; i++) {