From c183b6506534747773c2fda4b83e76b5ae28059f Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 17 Sep 2016 16:32:36 +0100
Subject: [PATCH] Fix original paint mode

---
 src/addresses.h    | 3 ++-
 src/drawing/font.c | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/addresses.h b/src/addresses.h
index c6c855b996..6f06ce48b0 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -93,6 +93,8 @@
 
 #define RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS			0x0141E9E4
 
+#define RCT2_ADDRESS_FONT_CHAR_WIDTH				0x0141E9E8
+
 #define RCT2_ADDRESS_CURRENT_SUPPORT_SEGMENTS		0x0141E9B4
 #define RCT2_ADDRESS_CURRENT_PAINT_TILE_MAX_HEIGHT  0x0141E9D8
 
@@ -519,7 +521,6 @@
 
 #define RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT		0x0141E9AC
 #define RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE		0x0141E9AE
-#define RCT2_ADDRESS_FONT_CHAR_WIDTH				0x0141E9E8
 #define RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER	0x0141ED68
 #define RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE			0x0141F56C
 #define RCT2_ADDRESS_WATER_RAISE_COST				0x0141F738
diff --git a/src/drawing/font.c b/src/drawing/font.c
index 7e8f57eac7..3b88be214f 100644
--- a/src/drawing/font.c
+++ b/src/drawing/font.c
@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"
 #include "drawing.h"
@@ -21,7 +22,11 @@
 
 static const int SpriteFontLineHeight[] = { 6, 10, 10, 18 };
 
-static uint8 _spriteFontCharacterWidths[896];
+#ifdef NO_RCT2
+static uint8 *_spriteFontCharacterWidths[896];
+#else
+static uint8 *_spriteFontCharacterWidths = RCT2_ADDRESS(RCT2_ADDRESS_FONT_CHAR_WIDTH, uint8);
+#endif
 
 TTFFontSetDescriptor *gCurrentTTFFontSet;