mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Moved function to gfx.c added new addresses

Browse Source
This commit is contained in:
Duncan Frost
2014-08-08 17:19:08 +01:00
parent 13b51fe475
commit 57f17f62e5
4 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/addresses.h
View File

@@ -84,6 +84,11 @@
#define RCT2_ADDRESS_DIRTY_BLOCK_COLUMNS 0x009ABDE8
#define RCT2_ADDRESS_DIRTY_BLOCK_ROWS 0x009ABDEC
//This is the number of pixels that are in the
//rain_pixel_store
#define RCT2_ADDRESS_NO_RAIN_PIXELS 0x009AC00C
#define RCT2_ADDRESS_RAIN_PATTERN 0x009AC010
#define RCT2_ADDRESS_LIGHTNING_ACTIVE 0x009AC068
#define RCT2_ADDRESS_VIEWPORT_PAINT_BITS_PTR 0x009AC118
@@ -163,6 +168,10 @@
#define RCT2_ADDRESS_PATH_TYPES 0x009ADA14
//Every pixel changed by rain is stored.
//32bit (pixel_offset 24 bit)(pixel_colour 8 bit)
#define RCT2_ADDRESS_RAIN_PIXEL_STORE 0x00EDF850
#define RCT2_ADDRESS_MAP_IMAGE_DATA 0x00F1AD68
#define RCT2_ADDRESS_PROVISIONAL_PATH_FLAGS 0x00F3EF92

63
src/game.c
View File

@@ -51,50 +51,6 @@ void game_handle_keyboard_input();
void process_mouse_over(int x, int y);
void sub_0x684027(int left, int top, int width, int height, int ebp, uint32 edi, uint32 esi){
uint8* pattern = RCT2_ADDRESS(0x9AC010, uint8*)[ebp];
uint8 pattern_x_space = *pattern++;
uint8 pattern_y_space = *pattern++;
uint8 pattern_start_x_offset = edi % pattern_x_space;
uint8 pattern_start_y_offset = esi % pattern_y_space;;
rct_drawpixelinfo* dpi = RCT2_ADDRESS(RCT2_ADDRESS_SCREEN_DPI, rct_drawpixelinfo);
uint32 pixel_offset = (dpi->pitch + dpi->width)*top + left;
uint8 pattern_y_pos = pattern_start_y_offset;
//Stores the colours of changed pixels
uint32* pixel_store = RCT2_ADDRESS(0xEDF850, uint32);
pixel_store += RCT2_GLOBAL(0x9AC00C, uint32);
for (; height != 0; height--){
uint8 pattern_x = pattern[pattern_y_pos * 2];
if (pattern_x != 0xFF){
if (RCT2_GLOBAL(0x9AC00C, uint32) <= 0x1F38){
int final_pixel_offset = width + pixel_offset;
int x_pixel_offset = pixel_offset;
x_pixel_offset += (pattern_x - pattern_start_x_offset)%pattern_x_space;
uint8 pattern_pixel = pattern[pattern_y_pos * 2 + 1];
for( ; x_pixel_offset < final_pixel_offset; x_pixel_offset += pattern_x_space){
uint8 current_pixel = dpi->bits[_pixel_offset];
dpi->bits[_pixel_offset] = pattern_pixel;
RCT2_GLOBAL(0x9AC00C, uint32)++;
*pixel_store++ = (x_pixel_offset << 8) | current_pixel; //Store colour and position
}
}
}
pixel_offset += dpi->pitch + dpi->width;
pattern_y_pos++;
pattern_y_pos %= pattern_y_space;
}
}
typedef void(*draw_rain_func)(int left, int top, int width, int height);
/**
@@ -109,8 +65,7 @@ void draw_light_rain(int left, int top, int width, int height){
edi += left;
esi += top;
sub_0x684027(left, top, width, height, 0, edi, esi);
//RCT2_CALLPROC_X(0x00684027, left, top, width, height, esi, edi, 0);
gfx_draw_rain(left, top, width, height, edi, esi);
edi = -RCT2_GLOBAL(0x00F663AC, int) + 0x18;
esi = (RCT2_GLOBAL(0x00F663AC, int) * 4) + 0x0D;
@@ -118,8 +73,7 @@ void draw_light_rain(int left, int top, int width, int height){
edi += left;
esi += top;
sub_0x684027(left, top, width, height, 0, edi, esi);
//RCT2_CALLPROC_X(0x00684027, left, top, width, height, esi, edi, 0);
gfx_draw_rain(left, top, width, height, edi, esi);
}
/**
@@ -134,8 +88,7 @@ void draw_heavy_rain(int left, int top, int width, int height){
edi += left;
esi += top;
sub_0x684027(left, top, width, height, 0, edi, esi);
//RCT2_CALLPROC_X(0x00684027, left, top, width, height, esi, edi, 0);
gfx_draw_rain(left, top, width, height, edi, esi);
edi = -RCT2_GLOBAL(0x00F663AC, int) + 0x10;
esi = (RCT2_GLOBAL(0x00F663AC, int) * 6) + 5;
@@ -144,8 +97,7 @@ void draw_heavy_rain(int left, int top, int width, int height){
edi += left;
esi += top;
sub_0x684027(left, top, width, height, 0, edi, esi);
//RCT2_CALLPROC_X(0x00684027, left, top, width, height, esi, edi, 0);
gfx_draw_rain(left, top, width, height, edi, esi);
edi = -RCT2_GLOBAL(0x00F663AC, int) + 8;
esi = (RCT2_GLOBAL(0x00F663AC, int) * 3) + 7;
@@ -154,8 +106,7 @@ void draw_heavy_rain(int left, int top, int width, int height){
edi += left;
esi += top;
sub_0x684027(left, top, width, height, 0, edi, esi);
//RCT2_CALLPROC_X(0x00684027, left, top, width, height, esi, edi, 0);
gfx_draw_rain(left, top, width, height, edi, esi);
edi = -RCT2_GLOBAL(0x00F663AC, int) + 0x18;
esi = (RCT2_GLOBAL(0x00F663AC, int) * 4) + 0x0D;
@@ -164,8 +115,7 @@ void draw_heavy_rain(int left, int top, int width, int height){
edi += left;
esi += top;
sub_0x684027(left, top, width, height, 0, edi, esi);
//RCT2_CALLPROC_X(0x00684027, left, top, width, height, esi, edi, 0);
gfx_draw_rain(left, top, width, height, edi, esi);
}
/**
@@ -484,7 +434,6 @@ void update_rain_animation()
// Get rain draw function and draw rain
uint32 draw_rain_func = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, uint8);
draw_rain_func = 2;
if (draw_rain_func > 0 && !(RCT2_GLOBAL(0x009DEA6F, uint8) & 1))
draw_rain_animation(draw_rain_func);
}

57
src/gfx.c
View File

@@ -2322,4 +2322,61 @@ rct_drawpixelinfo* clip_drawpixelinfo(rct_drawpixelinfo* dpi, int left, int widt
rct2_free(newDrawPixelInfo);
return NULL;
}
/***
*
* rct2: 0x00684027
*
* ebp used to be a parameter but it is always zero
* left : eax
* top : ebx
* width : ecx
* height : edx
* x_start: edi
* y_start: esi
*/
void gfx_draw_rain(int left, int top, int width, int height, uint32 x_start, uint32 y_start){
uint8* pattern = RCT2_GLOBAL(RCT2_ADDRESS_RAIN_PATTERN, uint8*);
uint8 pattern_x_space = *pattern++;
uint8 pattern_y_space = *pattern++;
uint8 pattern_start_x_offset = x_start % pattern_x_space;
uint8 pattern_start_y_offset = y_start % pattern_y_space;;
rct_drawpixelinfo* dpi = RCT2_ADDRESS(RCT2_ADDRESS_SCREEN_DPI, rct_drawpixelinfo);
uint32 pixel_offset = (dpi->pitch + dpi->width)*top + left;
uint8 pattern_y_pos = pattern_start_y_offset;
//Stores the colours of changed pixels
uint32* pixel_store = RCT2_ADDRESS(RCT2_ADDRESS_RAIN_PIXEL_STORE, uint32);
pixel_store += RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32);
for (; height != 0; height--){
uint8 pattern_x = pattern[pattern_y_pos * 2];
if (pattern_x != 0xFF){
if (RCT2_GLOBAL(0x9AC00C, uint32) <= 0x1F38){
int final_pixel_offset = width + pixel_offset;
int x_pixel_offset = pixel_offset;
x_pixel_offset += ((uint8)(pattern_x - pattern_start_x_offset)) % pattern_x_space;
uint8 pattern_pixel = pattern[pattern_y_pos * 2 + 1];
for (; x_pixel_offset < final_pixel_offset; x_pixel_offset += pattern_x_space){
uint8 current_pixel = dpi->bits[x_pixel_offset];
dpi->bits[x_pixel_offset] = pattern_pixel;
RCT2_GLOBAL(RCT2_ADDRESS_NO_RAIN_PIXELS, uint32)++;
//Store colour and position
*pixel_store++ = (x_pixel_offset << 8) | current_pixel;
}
}
}
pixel_offset += dpi->pitch + dpi->width;
pattern_y_pos++;
pattern_y_pos %= pattern_y_space;
}
}

2
src/gfx.h
View File

@@ -92,6 +92,8 @@ void gfx_draw_all_dirty_blocks();
void gfx_redraw_screen_rect(short left, short top, short right, short bottom);
void gfx_invalidate_screen();
void gfx_draw_rain(int left, int top, int width, int height, uint32 x_start, uint32 y_start);
rct_drawpixelinfo* clip_drawpixelinfo(rct_drawpixelinfo* dpi, int left, int width, int top, int height);
#endif