updating copy left. i am super fuckin busy with school, and trying to get life back...

[16.git] / src / fontgfx.c

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 0c300aa3efd77c06bbc9adc6428212e808e903ac..6f792549977414bca2ca599b5b1457b3efcf8623 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-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -21,19 +21,17 @@
  */\r
 #include <stdio.h>\r
 #include <conio.h>\r
-#include "lib/types.h"\r
+#include "src/lib/16_t.h"\r
 //#include "lib/16text.h"\r
-#include "lib/modex16.h"\r
+#include "src/lib/16_vl.h"\r
 \r
 #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
 void main(int argc, char near *argv[])\r
 {\r
+       static global_game_variables_t gvar;\r
        //JMOJI\r
        static byte e;\r
        //word ri;\r
@@ -101,7 +99,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 +119,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
@@ -131,8 +128,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 //     modexprint(0, 0, 1, 0, colpee, ROSE);\r
 //++++ getch();\r
        VGAmodeX(0, 1, &gvar);\r
-//     rosa=malloc(sizeof(ROSE));\r
-//     (*rosa)=(byte)ROSE;\r
        printf("\n%s\n", rose);\r
        //printf("\nh=%d\n", '8');\r
 //     printf("\n%c\n", e);\r