From 4ccb48f44012c316f7bd3301ffa48f64144ac0d8 Mon Sep 17 00:00:00 2001
From: Matt Penny <mwpenny@users.noreply.github.com>
Date: Tue, 11 Feb 2020 00:48:07 -0500
Subject: [PATCH] Use uint32_t instead of char32_t

---
 desktop_version/src/Graphics.cpp | 4 ++--
 desktop_version/src/Graphics.h   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp
index 935692ac..deb53474 100644
--- a/desktop_version/src/Graphics.cpp
+++ b/desktop_version/src/Graphics.cpp
@@ -133,7 +133,7 @@ void Graphics::init()
     showmousecursor = true;
 }
 
-int Graphics::font_idx(char32_t ch) {
+int Graphics::font_idx(uint32_t ch) {
     if (font_positions.size() > 0) {
         std::map<int, int>::iterator iter = font_positions.find(ch);
         if (iter == font_positions.end()) {
@@ -194,7 +194,7 @@ void Graphics::Makebfont()
     }
 }
 
-int Graphics::bfontlen(char32_t ch) {
+int Graphics::bfontlen(uint32_t ch) {
     if (ch < 32) {
         return 6;
     } else {
diff --git a/desktop_version/src/Graphics.h b/desktop_version/src/Graphics.h
index cdf53853..22fbe0bd 100644
--- a/desktop_version/src/Graphics.h
+++ b/desktop_version/src/Graphics.h
@@ -19,11 +19,6 @@
 #include "GraphicsUtil.h"
 #include "Screen.h"
 
-#if __cplusplus < 201103L  // Pre-C++11
-typedef uint32_t char32_t;
-typedef uint16_t char16_t;
-#endif
-
 class map;
 
 class Graphics
@@ -34,8 +29,8 @@ public:
 
 	GraphicsResources grphx;
 
-	int bfontlen(char32_t ch);
-	int font_idx(char32_t ch);
+	int bfontlen(uint32_t ch);
+	int font_idx(uint32_t ch);
 
 	void Makebfont();