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

Started trying to integrate viewport draw function

This commit is contained in:
Duncan Frost 2014-08-06 19:19:39 +01:00
parent 8d888756ca
commit 1c79d9c19a
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx.c
View File

@ -957,6 +957,8 @@ void gfx_draw_sprite(rct_drawpixelinfo *dpi, int image_id, int x, int y)
}
else if (image_type && !(image_type & IMAGE_TYPE_USE_PALETTE)){
//Has not been tested
RCT2_CALLPROC_X(0x0067A28E, 0, image_id, x, y, 0, (int)dpi, 0);
return;
RCT2_GLOBAL(0x9E3CDC, uint32) = 0;
unknown_pointer = NULL;

37
src/viewport.c
View File

@ -288,11 +288,14 @@ void sub_688485(){
rct_drawpixelinfo* dpi = RCT2_GLOBAL(0x140E9A8, rct_drawpixelinfo*);
paint_struct* ps = RCT2_GLOBAL(0xEE7884, paint_struct*);
paint_struct* previous_ps = ps;
int esi;
while (1){
ps = ps->var_24;
if (!ps) return;
previous_ps = ps;
x68849D:
previous_ps = previous_ps;
//push ebp
int ecx = ps->var_14;
int edx = ps->var_16;
@ -338,10 +341,13 @@ void sub_688485(){
gfx_draw_sprite(dpi, ebx, ecx, edx);
//pop ebp??
if (ps->var_20 != 0){
//jmp 0x68858E
ps = ps->var_20;
goto x68849D;
//jmp 0x68849D
}
int esi = ps->var_1C;
esi = ps->var_1C;
if (esi != 0){
goto x688596;
//jmp 0x688596
}
ps = previous_ps;
@ -349,22 +355,25 @@ void sub_688485(){
continue;
}
//push ebp
int _ebp = ps->var_04;
RCT2_CALLPROC_X(0x00681DE2, 0, ebx, ecx, edx, 0, (int)dpi, ps->var_04);
//Call 681DE2
//pop ebp
if (ps->var_20 != 0){
ps = ps->var_20;
continue; //Skip to just after first push ebp
goto x68849D;
//jmp 68849D
}
int esi = ps->var_1C;
esi = ps->var_1C;
if (esi != 0){
goto x688596;
//jmp 0x688596
}
ps = previous_ps;
//pop ebp
continue;
x688596:
//688596
//push esi
//push ebp
@ -391,27 +400,32 @@ void sub_688485(){
}
}
if (!(esi + 0xC & 1)){
if (!(*((uint8*)(esi + 0xC)) & 1)){
int _ebp = ps->var_04;
gfx_draw_sprite(dpi, ebx, ecx, edx);
//call 67A28E draw_sprite
//pop ebp
//pop esi
esi = *(uint32*)(esi + 0xE);
if (esi){} //jmp to 688596 continue;?
if (esi){
goto x688596;//jmp to 688596 continue;?
}
ps = previous_ps;
continue;
//pop ebp
//jmp 688491 i.e. start of previous loop
}
_ebp = ps->var_04;
RCT2_CALLPROC_X(0x00681DE2, 0, ebx, ecx, edx, 0,(int) dpi, ps->var_04);
//call 681DE2
//pop ebp
//pop esi
esi = *(uint32*)(esi + 0xE);
if (esi) {}//jmp to 688596 continue;?
if (esi) {
goto x688596;//jmp to 688596 continue;?
}
ps = previous_ps;
//pop ebp
//jmp 688491 i.e. start of previous loop
}
}
@ -769,7 +783,8 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
sub_0x68B6C2();
//RCT2_CALLPROC_X(0x68B6C2, 0, 0, 0, 0, 0, 0, 0); //Big function call 4 rotation versions
RCT2_CALLFUNC_X(0x688217, &start_x, &ebx, &ecx, (int*)&bits_pointer, &esi, (int*)&dpi2, &ebp); //Move memory
RCT2_CALLFUNC_X(0x688485, &start_x, &ebx, &ecx, (int*)&bits_pointer, &esi, (int*)&dpi2, &ebp); //Big function call
sub_688485();
//RCT2_CALLFUNC_X(0x688485, &start_x, &ebx, &ecx, (int*)&bits_pointer, &esi, (int*)&dpi2, &ebp); //Big function call
int weather_colour = RCT2_ADDRESS(0x98195C, uint32)[RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_WEATHER_GLOOM, uint8)];
if ((weather_colour != -1) && (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint16) & 0x4000) && (RCT2_GLOBAL(0x9DEA6F, uint8) & 1)){