From f2fe4df1ed95c7646d0fb718a106beb31aa1e77f Mon Sep 17 00:00:00 2001
From: Duncan Frost <duncans_pumpkin@hotmail.co.uk>
Date: Sun, 21 Sep 2014 09:21:36 +0100
Subject: [PATCH] Fix small issues with ride_window.

---
 src/gfx.c         | 2 +-
 src/widget.c      | 3 +++
 src/window_ride.c | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gfx.c b/src/gfx.c
index 53c4942d59..6ca5237ec7 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -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;
diff --git a/src/widget.c b/src/widget.c
index 0e4038d337..7a460654d2 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -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;
 
diff --git a/src/window_ride.c b/src/window_ride.c
index a96f0241da..54b9b205fa 100644
--- a/src/window_ride.c
+++ b/src/window_ride.c
@@ -3908,11 +3908,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);
 
 	// ?