Merge remote-tracking branch 'upstream/master'

[16.git] / src / fontgfx.c

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 0c300aa3efd77c06bbc9adc6428212e808e903ac..354a897bf5bdab0ee7bead1886db0717071975ea 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -28,7 +28,6 @@
 #include <hw/cpu/cpu.h>\r
 #include <hw/dos/dos.h>\r
 #include <hw/vga/vga.h>\r
-#include <hw/vga/vgatty.h>\r
 \r
 global_game_variables_t gvar;\r
 \r
@@ -101,7 +100,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
        chx=0;\r
        chy=0;\r
        colpee=32;\r
-//     bios_cls();\r
        /* position the cursor to home */\r
 //     vga_moveto(0,0);\r
 //     vga_sync_bios_cursor();\r
@@ -122,7 +120,7 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
                if(colpee>=32+24) colpee=32;\r
        }\r
        getch();\r
-       modexprint(&gvar.video.page[0], 0, 0, 1, 0, colpee, &rose);\r
+       modexprint(&gvar.video.page[0], gvar.video.page[0].width - (8*16)/*HACK: The rose ASCII is too wide for 320x240 so offset it to make sure the petals are visible*/, 8, 1, 45, 0, &rose);\r
        getch();\r
        //modexprint(100, 100, 1, 47, 0, "wwww");\r
 //     modexprint(0, 0, 1, 0, colpee, &rose);\r