1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00

Replace more addresses with their named constants

Also named window.var_4B2/4 as saved_view_x/y
This commit is contained in:
ZedThree
2014-05-04 12:56:35 +02:00
parent ddf51a7edd
commit b3ea71c080
9 changed files with 34 additions and 31 deletions

View File

@@ -399,8 +399,8 @@ static void game_handle_input_mouse(int x, int y, int state)
RCT2_GLOBAL(0x009DE540, sint16) = 1000;
dx <<= viewport->zoom + 1;
dy <<= viewport->zoom + 1;
w->var_4B2 += dx;
w->var_4B4 += dy;
w->saved_view_x += dx;
w->saved_view_y += dy;
}
}
} else if (state == 4) {
@@ -795,11 +795,11 @@ void game_handle_edge_scroll()
// Scroll viewport
if (scrollX != 0) {
mainWindow->var_4B2 += scrollX * (12 << mainWindow->viewport->zoom);
mainWindow->saved_view_x += scrollX * (12 << mainWindow->viewport->zoom);
RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 7);
}
if (scrollY != 0) {
mainWindow->var_4B4 += scrollY * (12 << mainWindow->viewport->zoom);
mainWindow->saved_view_y += scrollY * (12 << mainWindow->viewport->zoom);
RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 7);
}
}
@@ -836,11 +836,11 @@ void game_handle_key_scroll()
// Scroll viewport
if (scrollX != 0) {
mainWindow->var_4B2 += scrollX * (12 << mainWindow->viewport->zoom);
mainWindow->saved_view_x += scrollX * (12 << mainWindow->viewport->zoom);
RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 7);
}
if (scrollY != 0) {
mainWindow->var_4B4 += scrollY * (12 << mainWindow->viewport->zoom);
mainWindow->saved_view_y += scrollY * (12 << mainWindow->viewport->zoom);
RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 7);
}
}