diff --git a/src/gfx.c b/src/gfx.c
index a546ac8231..ce3c8cdac8 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -1061,18 +1061,20 @@ void gfx_redraw_screen_rect(short left, short top, short right, short bottom)
  *  rct2: 0x006C2321
  * buffer (esi)
  */
-int gfx_get_string_width(char *buffer)
+int gfx_get_string_width(char* buffer)
 {
-	int base;
+	// Current font sprites
+	uint16 current_font_sprite_base;
+	// Width of string
 	int width;
 
-	base = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16);
+	current_font_sprite_base = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16);
 	width = 0;
 
-	for (uint8* curr_char = buffer; *curr_char > 0; curr_char++) {
+	for (char* curr_char = buffer; *curr_char > 0; curr_char++) {
 
 		if (*curr_char >= 0x20) {
-			width += RCT2_ADDRESS(0x0141E9E8, uint8)[base + (*curr_char-0x20)];
+			width += RCT2_ADDRESS(0x0141E9E8, uint8)[current_font_sprite_base + (*curr_char-0x20)];
 			continue;
 		}
 		switch(*curr_char) {
@@ -1086,16 +1088,16 @@ int gfx_get_string_width(char *buffer)
 			curr_char++;
 			break;
 		case 7:
-			base = 0x1C0;
+			current_font_sprite_base = 0x1C0;
 			break;
 		case 8:
-			base = 0x2A0;
+			current_font_sprite_base = 0x2A0;
 			break;
 		case 9:
-			base = 0x0E0;
+			current_font_sprite_base = 0x0E0;
 			break;
 		case 0x0A:
-			base = 0;
+			current_font_sprite_base = 0;
 			break;
 		case 0x17:
 			width = RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS + 4, uint16)[(*curr_char & 0x7FFFF) << 4];