ref: aac1c9c844bb05bf39b8659b2e9a8641e387ce97
parent: fe76fe6dea65ef192b634d71fbe73e2a5eaff9be
author: Clownacy <Clownacy@users.noreply.github.com>
date: Wed Sep 16 17:00:41 EDT 2020
Get 640x480 and Japanese builds working again
binary files a/game_english/data/Font/couriernew1.PNG /dev/null differ
binary files a/game_english/data/Font/couriernew1.dat /dev/null differ
binary files a/game_english/data/Font/couriernew2.PNG /dev/null differ
binary files a/game_english/data/Font/couriernew2.dat /dev/null differ
binary files /dev/null b/game_english/data/Font/font_bitmap_10x20.dat differ
binary files /dev/null b/game_english/data/Font/font_bitmap_10x20.png differ
binary files /dev/null b/game_english/data/Font/font_bitmap_6x12.dat differ
binary files /dev/null b/game_english/data/Font/font_bitmap_6x12.png differ
binary files /dev/null b/game_japanese/data/Font/font_bitmap_10x20.dat differ
binary files /dev/null b/game_japanese/data/Font/font_bitmap_10x20.png differ
binary files /dev/null b/game_japanese/data/Font/font_bitmap_6x12.dat differ
binary files /dev/null b/game_japanese/data/Font/font_bitmap_6x12.png differ
binary files a/game_japanese/data/Font/msgothic1.PNG /dev/null differ
binary files a/game_japanese/data/Font/msgothic1.dat /dev/null differ
binary files a/game_japanese/data/Font/msgothic2.PNG /dev/null differ
binary files a/game_japanese/data/Font/msgothic2.dat /dev/null differ
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -657,7 +657,7 @@
void InitTextObject(const char *name)
{(void)name; // Unused in this branch
-
+/*
std::string path = gDataPath + "/Font/font";
// Get font size
@@ -705,10 +705,24 @@
#endif
}
-// font = LoadFont(path.c_str(), width, height);
+ font = LoadFont(path.c_str(), width, height);
+*/
+ std::string bitmap_path;
+ std::string metadata_path;
- std::string bitmap_path = gDataPath + "/Font/couriernew2.PNG";
- std::string metadata_path = gDataPath + "/Font/couriernew2.dat";
+ 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;
+ }
+
font = LoadBitmapFont(bitmap_path.c_str(), metadata_path.c_str());
}