smaller font for game id

KrahJohlito · Nov 16, 2024 · bed1dfb · bed1dfb
1 parent becbfcf
commit bed1dfb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/misc/conf_theme_OPL.cfg b/misc/conf_theme_OPL.cfg
@@ -56,6 +56,7 @@ main5:
 	type=ItemText
 	x=-124
 	y=-155
+	font=1
 appsMain5:
 	type=ItemText
 	x=-124

diff --git a/misc/conf_theme_OPL_CF.cfg b/misc/conf_theme_OPL_CF.cfg
@@ -22,6 +22,7 @@ main4:
 	type=ItemText
 	x=POS_MID
 	y=340
+	font=1
 main5:
 	type=HintText
 	aligned=1

diff --git a/src/fntsys.c b/src/fntsys.c
@@ -99,6 +99,8 @@ static FT_Vector delta;
 
 #define GLYPH_PAGE_OK(font, page) ((pageid <= font->cacheMaxPageID) && (font->glyphCache[page]))
 
+static int fntLoadDefaultInternal(char *path, int fontSize, int slot);
+
 static void fntCacheFlushPage(fnt_glyph_cache_entry_t *page)
 {
     int i;
@@ -285,7 +287,8 @@ void fntInit()
     for (; i < FNT_MAX_COUNT; ++i)
         fntInitSlot(&fonts[i]);
 
-    fntLoadDefault(NULL);
+    fntLoadDefaultInternal(NULL, FNTSYS_DEFAULT_SIZE, FNT_DEFAULT);
+    fntLoadDefaultInternal(NULL, 12, 1);
 }
 
 int fntLoadFile(char *path, int fontSize)
@@ -304,17 +307,22 @@ int fntLoadFile(char *path, int fontSize)
     return FNT_ERROR;
 }
 
-int fntLoadDefault(char *path)
+static int fntLoadDefaultInternal(char *path, int fontSize, int slot)
 {
     font_t newFont, oldFont;
 
-    if (fntLoadSlot(&newFont, path, FNTSYS_DEFAULT_SIZE) != FNT_ERROR) {
+    if (slot < 0 || slot >= FNT_MAX_COUNT) {
+        LOG("FNTSYS Invalid font slot: %d\n", slot);
+        return -1;
+    }
+
+    if (fntLoadSlot(&newFont, path, fontSize) != FNT_ERROR) {
         // copy over the new font definition
         // we have to lock this phase, as the old font may still be used
         // Note: No check for concurrency is done here, which is kinda funky!
         WaitSema(gFontSemaId);
-        memcpy(&oldFont, &fonts[FNT_DEFAULT], sizeof(font_t));
-        memcpy(&fonts[FNT_DEFAULT], &newFont, sizeof(font_t));
+        memcpy(&oldFont, &fonts[slot], sizeof(font_t));
+        memcpy(&fonts[slot], &newFont, sizeof(font_t));
         SignalSema(gFontSemaId);
 
         // delete the old font
@@ -326,6 +334,11 @@ int fntLoadDefault(char *path)
     return -1;
 }
 
+int fntLoadDefault(char *path)
+{
+    return fntLoadDefaultInternal(path, FNTSYS_DEFAULT_SIZE, FNT_DEFAULT);
+}
+
 void fntEnd()
 {
     LOG("FNTSYS End\n");