mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity

Merge pull request #471 from duncanspumpkin/fix_ride_window

Browse Source 
Fix small issues with ride_window.
This commit is contained in:
Ted John
2014-09-21 11:03:47 +01:00
parent 012ffcd8b2 fa2a5cfa2c
commit 0e7037ee90
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gfx.c
View File

@@ -2072,7 +2072,7 @@ void gfx_draw_string(rct_drawpixelinfo *dpi, char *buffer, int colour, int x, in
// Control codes
switch (al) {
case FORMAT_MOVE_X://Start New Line at start+buffer x, same y. (Overwrite?)
max_x = x + *++buffer;
max_x = x + (uint8)*++buffer;
break;
case FORMAT_ADJUST_PALETTE:
al = *++buffer;

3
src/widget.c
View File

@@ -809,6 +809,9 @@ static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget
if (scroll->flags & VSCROLLBAR_VISIBLE)
r -= 11;
b++;
r++;
// Create a new inner scroll dpi
scroll_dpi = *dpi;

7
src/window_ride.c
View File

@@ -1201,6 +1201,7 @@ static void window_ride_set_page(rct_window *w, int page)
w->enabled_widgets = window_ride_page_enabled_widgets[page];
w->var_020 = RCT2_ADDRESS(0x0098DD68, uint32)[page];
w->event_handlers = window_ride_page_events[page];
w->pressed_widgets = 0;
w->widgets = window_ride_page_widgets[page];
RCT2_CALLPROC_X(0x006AEB9F, 0, 0, 0, 0, (int)w, 0, 0);
window_invalidate(w);
@@ -3908,11 +3909,11 @@ static void window_ride_colour_scrollpaint()
vehicleColour = ride_get_vehicle_colour(ride, w->var_48C);
// Background colour
gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width, dpi->y + dpi->height, 12);
gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, 12);
// ?
x = dpi->x + (vehiclePreviewWidget->right - vehiclePreviewWidget->left) / 2;
y = dpi->y + vehiclePreviewWidget->bottom - vehiclePreviewWidget->top - 15;
x = (vehiclePreviewWidget->right - vehiclePreviewWidget->left) / 2;
y = vehiclePreviewWidget->bottom - vehiclePreviewWidget->top - 15;
RCT2_CALLPROC_X(0x006DE4CD, (ride->num_cars_per_train << 8) | ride->subtype, (int)ride, x, y, (int)w, (int)dpi, 0);
// ?