[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-944-g01124ad

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  01124ad934026a6386348426fc3260448c969b4a (commit)
       via  e295ac1ce38183dab7b797d4067b4b06d78224fb (commit)
      from  dfbcd7ee95a047f82db4db8cb29e843cd3c822b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 01124ad934026a6386348426fc3260448c969b4a
Merge: dfbcd7e e295ac1
Author: Lawrence Sebald <ljs...@us...>
Date:   Sat Jun 3 21:52:40 2023 -0400

    Merge pull request #237 from KallistiOS/bfont-example-fix
    
    Fix text encoding issues with video/bfont

commit e295ac1ce38183dab7b797d4067b4b06d78224fb
Author: darc <da...@pr...>
Date:   Sat Jun 3 20:49:10 2023 -0500

    Fix text encoding issues with video/bfont

-----------------------------------------------------------------------

Summary of changes:
 examples/dreamcast/video/bfont/bfont.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/dreamcast/video/bfont/bfont.c b/examples/dreamcast/video/bfont/bfont.c
index effea99..2d4192b 100644
--- a/examples/dreamcast/video/bfont/bfont.c
+++ b/examples/dreamcast/video/bfont/bfont.c
@@ -28,27 +28,27 @@ int main(int argc, char **argv) {
     bfont_draw_str(vram_s + o, 640, 1, "Test of basic ASCII");  
     /* After each string, we'll increment the offset down by one row */
     o += 640 * BFONT_HEIGHT;
-    bfont_draw_str(vram_s + o, 640, 1, "Parlez-vous fran�ais?");
+    bfont_draw_str(vram_s + o, 640, 1, "Parlez-vous français?");
     o += 640 * BFONT_HEIGHT;
 
     /* Do a second set drawn transparently */
     bfont_draw_str(vram_s + o, 640, 0, "Test of basic ASCII");
     o += 640 * BFONT_HEIGHT;
-    bfont_draw_str(vram_s + o, 640, 0, "Parlez-vous fran�ais?");
+    bfont_draw_str(vram_s + o, 640, 0, "Parlez-vous français?");
     o += 640 * BFONT_HEIGHT;
 
     /* Test with EUC encoding */
     bfont_set_encoding(BFONT_CODE_EUC);
-    bfont_draw_str(vram_s + o, 640, 1, "�����ˤ�� EUC!");
+    bfont_draw_str(vram_s + o, 640, 1, "¤³¤ó¤Ë¤Á¤Ï EUC!");
     o += 640 * BFONT_HEIGHT;
-    bfont_draw_str(vram_s + o, 640, 0, "�����ˤ�� EUC!");
+    bfont_draw_str(vram_s + o, 640, 0, "¤³¤ó¤Ë¤Á¤Ï EUC!");
     o += 640 * BFONT_HEIGHT;
 
     /* Test with Shift-JIS encoding */
     bfont_set_encoding(BFONT_CODE_SJIS);
-    bfont_draw_str(vram_s + o, 640, 1, "�A�h���X�ϊ� SJIS");
+    bfont_draw_str(vram_s + o, 640, 1, "ƒAƒhƒŒƒX•ÏŠ· SJIS");
     o += 640 * BFONT_HEIGHT;
-    bfont_draw_str(vram_s + o, 640, 0, "�A�h���X�ϊ� SJIS");
+    bfont_draw_str(vram_s + o, 640, 0, "ƒAƒhƒŒƒX•ÏŠ· SJIS");
     o += 640 * BFONT_HEIGHT;
 
     /* Drawing the special symbols is a bit convoluted. First we'll draw some


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.