From 5f55b46badfd681294aa627602b90e5e1ff10468 Mon Sep 17 00:00:00 2001 From: SlyVTT Date: Mon, 10 Jul 2023 20:55:27 +0200 Subject: [PATCH] added custom font support for both plateform + created a dummy font + corrected dialog text line spacing --- CMakeLists.txt | 2 ++ README.md | 1 + assets-cg/font.png | Bin 0 -> 15185 bytes assets-cg/fxconv-metadata.txt | 10 ++++++++++ assets-fx/font.png | Bin 0 -> 15187 bytes assets-fx/fxconv-metadata.txt | 11 +++++++++++ src/dialogs.c | 5 ++++- 7 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 assets-cg/font.png create mode 100644 assets-fx/font.png diff --git a/CMakeLists.txt b/CMakeLists.txt index c02ba57..d36cab6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ set(ASSETS set(ASSETS_cg assets-cg/demo_player.png assets-cg/player_face.png + assets-cg/font.png ) set(ASSETS_cg_2b @@ -65,6 +66,7 @@ set(ASSETS_cg_EGA64 set(ASSETS_fx assets-fx/demo_player.png assets-fx/player_face.png + assets-fx/font.png # ... ) diff --git a/README.md b/README.md index e688b87..ed58c27 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ A ce stade, on a déjà implémenté : - [x] Carte Multilayer (Background, Foreground + accessibilité / Dommages) avec transparence du calque Foreground - [x] Personnage - [ ] Dialogues +- [ ] Fontes de caractères - [ ] Interraction - [ ] NPC - [ ] Changement de map diff --git a/assets-cg/font.png b/assets-cg/font.png new file mode 100644 index 0000000000000000000000000000000000000000..148bcb3e85d0c11452cee2744bc18602594e4ded GIT binary patch literal 15185 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 S-0{CZI4H`h$<#_&g#UjxS|p7C literal 0 HcmV?d00001 diff --git a/assets-fx/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt index 13d828d..0bfccdd 100644 --- a/assets-fx/fxconv-metadata.txt +++ b/assets-fx/fxconv-metadata.txt @@ -5,3 +5,14 @@ demo_player.png: player_face.png: type: bopti-image name: player_face_img + + +font.png: + name: fontRPG + type: font + charset: print + grid.size: 5x5 + grid.padding: 1 + grid.border: 0 + proportional: true + height: 5 \ No newline at end of file diff --git a/src/dialogs.c b/src/dialogs.c index f8df2f6..b4cb299 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -5,7 +5,10 @@ #define BOX_HEIGHT (F_HEIGHT/PXSIZE+8) +extern font_t fontRPG; + void showtext(Game *game, bopti_image_t *face, char *text) { + dfont(&fontRPG); unsigned int i; for(i=0;i