X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ffontgfx.c;h=6f792549977414bca2ca599b5b1457b3efcf8623;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=0c300aa3efd77c06bbc9adc6428212e808e903ac;hpb=34d55bd3f03eabdfc0e13c00b85e2091a211488a;p=16.git

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 0c300aa3..6f792549 100755
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -21,19 +21,17 @@
  */
 #include <stdio.h>
 #include <conio.h>
-#include "lib/types.h"
+#include "src/lib/16_t.h"
 //#include "lib/16text.h"
-#include "lib/modex16.h"
+#include "src/lib/16_vl.h"
 
 #include <hw/cpu/cpu.h>
 #include <hw/dos/dos.h>
 #include <hw/vga/vga.h>
-#include <hw/vga/vgatty.h>
-
-global_game_variables_t gvar;
 
 void main(int argc, char near *argv[])
 {
+	static global_game_variables_t gvar;
 	//JMOJI
 	static byte e;
 	//word ri;
@@ -101,7 +99,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 	chx=0;
 	chy=0;
 	colpee=32;
-//	bios_cls();
 	/* position the cursor to home */
 //	vga_moveto(0,0);
 //	vga_sync_bios_cursor();
@@ -122,7 +119,7 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 		if(colpee>=32+24) colpee=32;
 	}
 	getch();
-	modexprint(&gvar.video.page[0], 0, 0, 1, 0, colpee, &rose);
+	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);
 	getch();
 	//modexprint(100, 100, 1, 47, 0, "wwww");
 //	modexprint(0, 0, 1, 0, colpee, &rose);
@@ -131,8 +128,6 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 //	modexprint(0, 0, 1, 0, colpee, ROSE);
 //++++	getch();
 	VGAmodeX(0, 1, &gvar);
-//	rosa=malloc(sizeof(ROSE));
-//	(*rosa)=(byte)ROSE;
 	printf("\n%s\n", rose);
 	//printf("\nh=%d\n", '8');
 //	printf("\n%c\n", e);