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

Properly pass dx and bp

This commit is contained in:
Duncan Frost 2014-12-17 22:08:57 +00:00
parent 03da2b07a6
commit c0378279f8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/interface/viewport.c
View File

@ -298,8 +298,8 @@ void sub_689174(sint16* x, sint16* y, sint16 *z, uint8 curr_rotation){
// //
//} //}
void sub_6E7F34(rct_window* w, rct_viewport* viewport){ void sub_6E7F34(rct_window* w, rct_viewport* viewport, sint16 x_diff, sint16 y_diff){
//RCT2_CALLPROC_X(0x6E7F34, 0, 0, 0, previous_x, (int)viewport, (int)w, previous_y); //RCT2_CALLPROC_X(0x6E7F34, 0, 0, 0, x_diff, (int)viewport, (int)w, y_diff);
rct_window* orignal_w = w; rct_window* orignal_w = w;
int left = 0, right = 0, top = 0, bottom = 0; int left = 0, right = 0, top = 0, bottom = 0;
@ -331,7 +331,7 @@ void sub_6E7F34(rct_window* w, rct_viewport* viewport){
} }
w = orignal_w; w = orignal_w;
RCT2_CALLPROC_X(0x6E7FF3, 0, 0, 0, right, (int)viewport, (int)w, bottom); RCT2_CALLPROC_X(0x6E7FF3, 0, 0, 0, x_diff, (int)viewport, (int)w, y_diff);
} }
/* There is a bug in this. */ /* There is a bug in this. */
@ -340,13 +340,14 @@ void sub_6E7DE1(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport){
//return; //return;
uint8 zoom = (1 << viewport->zoom); uint8 zoom = (1 << viewport->zoom);
sint16 previous_x = viewport->view_x / zoom; sint16 x_diff = (viewport->view_x - x) / zoom;
sint16 previous_y = viewport->view_y / zoom; sint16 y_diff = (viewport->view_y - y) / zoom;
viewport->view_x = x; viewport->view_x = x;
viewport->view_y = y; viewport->view_y = y;
if (((x / zoom) == previous_x) && ((y / zoom) == previous_y))return; // If no change in viewing area
if ((!x_diff) && (!y_diff))return;
if (w->flags & WF_7){ if (w->flags & WF_7){
int left = max(viewport->x, 0); int left = max(viewport->x, 0);
@ -400,8 +401,8 @@ void sub_6E7DE1(sint16 x, sint16 y, rct_window* w, rct_viewport* viewport){
return; return;
} }
sub_6E7F34(w, viewport); sub_6E7F34(w, viewport, x_diff, y_diff);
//RCT2_CALLPROC_X(0x6E7F34, 0, 0, 0, 0, (int)viewport, (int)w, 0); //RCT2_CALLPROC_X(0x6E7F34, 0, 0, 0, x_diff, (int)viewport, (int)w, y_diff);
memcpy(viewport, &view_copy, sizeof(rct_viewport)); memcpy(viewport, &view_copy, sizeof(rct_viewport));
} }