From aac1c9c844bb05bf39b8659b2e9a8641e387ce97 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Wed, 16 Sep 2020 21:00:41 +0100
Subject: [PATCH] Get 640x480 and Japanese builds working again

---
 ...{couriernew2.dat => font_bitmap_10x20.dat} | Bin
 ...{couriernew2.PNG => font_bitmap_10x20.png} | Bin
 .../{couriernew1.dat => font_bitmap_6x12.dat} | Bin
 .../{couriernew1.PNG => font_bitmap_6x12.png} | Bin
 .../{msgothic2.dat => font_bitmap_10x20.dat}  | Bin
 .../{msgothic2.PNG => font_bitmap_10x20.png}  | Bin
 .../{msgothic1.dat => font_bitmap_6x12.dat}   | Bin
 .../{msgothic1.PNG => font_bitmap_6x12.png}   | Bin
 src/Draw.cpp                                  |  22 ++++++++++++++----
 9 files changed, 18 insertions(+), 4 deletions(-)
 rename game_english/data/Font/{couriernew2.dat => font_bitmap_10x20.dat} (100%)
 rename game_english/data/Font/{couriernew2.PNG => font_bitmap_10x20.png} (100%)
 rename game_english/data/Font/{couriernew1.dat => font_bitmap_6x12.dat} (100%)
 rename game_english/data/Font/{couriernew1.PNG => font_bitmap_6x12.png} (100%)
 rename game_japanese/data/Font/{msgothic2.dat => font_bitmap_10x20.dat} (100%)
 rename game_japanese/data/Font/{msgothic2.PNG => font_bitmap_10x20.png} (100%)
 rename game_japanese/data/Font/{msgothic1.dat => font_bitmap_6x12.dat} (100%)
 rename game_japanese/data/Font/{msgothic1.PNG => font_bitmap_6x12.png} (100%)

diff --git a/game_english/data/Font/couriernew2.dat b/game_english/data/Font/font_bitmap_10x20.dat
similarity index 100%
rename from game_english/data/Font/couriernew2.dat
rename to game_english/data/Font/font_bitmap_10x20.dat
diff --git a/game_english/data/Font/couriernew2.PNG b/game_english/data/Font/font_bitmap_10x20.png
similarity index 100%
rename from game_english/data/Font/couriernew2.PNG
rename to game_english/data/Font/font_bitmap_10x20.png
diff --git a/game_english/data/Font/couriernew1.dat b/game_english/data/Font/font_bitmap_6x12.dat
similarity index 100%
rename from game_english/data/Font/couriernew1.dat
rename to game_english/data/Font/font_bitmap_6x12.dat
diff --git a/game_english/data/Font/couriernew1.PNG b/game_english/data/Font/font_bitmap_6x12.png
similarity index 100%
rename from game_english/data/Font/couriernew1.PNG
rename to game_english/data/Font/font_bitmap_6x12.png
diff --git a/game_japanese/data/Font/msgothic2.dat b/game_japanese/data/Font/font_bitmap_10x20.dat
similarity index 100%
rename from game_japanese/data/Font/msgothic2.dat
rename to game_japanese/data/Font/font_bitmap_10x20.dat
diff --git a/game_japanese/data/Font/msgothic2.PNG b/game_japanese/data/Font/font_bitmap_10x20.png
similarity index 100%
rename from game_japanese/data/Font/msgothic2.PNG
rename to game_japanese/data/Font/font_bitmap_10x20.png
diff --git a/game_japanese/data/Font/msgothic1.dat b/game_japanese/data/Font/font_bitmap_6x12.dat
similarity index 100%
rename from game_japanese/data/Font/msgothic1.dat
rename to game_japanese/data/Font/font_bitmap_6x12.dat
diff --git a/game_japanese/data/Font/msgothic1.PNG b/game_japanese/data/Font/font_bitmap_6x12.png
similarity index 100%
rename from game_japanese/data/Font/msgothic1.PNG
rename to game_japanese/data/Font/font_bitmap_6x12.png
diff --git a/src/Draw.cpp b/src/Draw.cpp
index b3fb2b9a..cc76913f 100644
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -657,7 +657,7 @@ int RestoreSurfaces(void)
 void InitTextObject(const char *name)
 {
 	(void)name;	// Unused in this branch
-
+/*
 	std::string path = gDataPath + "/Font/font";
 
 	// Get font size
@@ -705,10 +705,24 @@ void InitTextObject(const char *name)
 #endif
 	}
 
-//	font = LoadFont(path.c_str(), width, height);
+	font = LoadFont(path.c_str(), width, height);
+*/
+	std::string bitmap_path;
+	std::string metadata_path;
+
+	switch (mag)
+	{
+		case 1:
+			bitmap_path = gDataPath + "/Font/font_bitmap_6x12.png";
+			metadata_path = gDataPath + "/Font/font_bitmap_6x12.dat";
+			break;
+
+		case 2:
+			bitmap_path = gDataPath + "/Font/font_bitmap_10x20.png";
+			metadata_path = gDataPath + "/Font/font_bitmap_10x20.dat";
+			break;
+	}
 
-	std::string bitmap_path = gDataPath + "/Font/couriernew2.PNG";
-	std::string metadata_path = gDataPath + "/Font/couriernew2.dat";
 	font = LoadBitmapFont(bitmap_path.c_str(), metadata_path.c_str());
 }