X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ffontgfx.c;h=0f721083e68bb58b036ee0c5b7327bad24e4059e;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=89e2e2f563d3de2c976ca9a368b6d2b3079c0034;hpb=54e80274a159f2c8f12bbb284403927616c686c5;p=16.git

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 89e2e2f5..0f721083 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-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -21,20 +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[])
 {
-	struct vga_mode_params cm;
+	static global_game_variables_t gvar;
 	//JMOJI
 	static byte e;
 	//word ri;
@@ -67,8 +64,7 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 ,'___...---~~~\n\
 ";
 //	static byte *rosa;
-	static word chx, chy, colpee;
-	static word z;
+	static word chx, chy, colpee, addr;
 	textInit();
 
 	// DOSLIB: check our environment
@@ -92,52 +88,39 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 		return;
 	}
 	VGAmodeX(1, 1, &gvar);
-// 	__asm{
-// 		mov	AH,12H
-// 		mov	BL,30h
-// 		mov	AL,04h
-// 		int 10
-// 		mov	ax,1123h
-// 		int	10h
-// 		;mov	ax,1112h                ; load 8x8 character set into RAM
-// 		;int	10h
-// 	}
 	/* setup camera and screen~ */
 	gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
 	gvar.video.page[0].width += (16*2);
 	gvar.video.page[0].height += (16*2);
 	modexShowPage(&gvar.video.page[0]);
-	vga_read_crtc_mode(&cm);
 	// NTS: We're in Mode-X now. printf() is useless. Do not use printf(). Or INT 10h text printing. Or DOS console output.
 	//modexprint(16, 16, 1, 15, "wwww");
 	//getch();
 	chx=0;
 	chy=0;
-//	colpee=32;
-//	bios_cls();
+	colpee=32;
 	/* position the cursor to home */
 //	vga_moveto(0,0);
 //	vga_sync_bios_cursor();
-	for(e=0x00, z=0; e<=0xFE; e++, z++)
+	for(e=0x00; e<=0xFE; e++)
 	{
-		//if(chx+8>(gvar.video.page[0].width/2))
-		if((z)+1>16)
+		if(chx+8>(gvar.video.page[0].width/2))
 		{
 			chx=0;
 			chy+=8;
 			sprintf(pee,"%u", colpee);
-			modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 1);
-			z=0;
-//			printf("\n");
+			modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee);
 			//getch();
 		}
 		sprintf(pee, "%zc", e);
-		modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 1);
-		chx+=9;
+		modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e);
+		chx+=8;
 		colpee++;
-//		if(colpee>=32+24) colpee=32;
+		if(colpee>=32+24) colpee=32;
 	}
 	getch();
+	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);
 //++++	modexprint(&gvar.video.page[0], 0, 0, 0, 0, colpee, &ibmlogo);
@@ -145,11 +128,7 @@ 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);
-	printf("cm.offset=%d\n", cm.offset);
-	printf("vga_state.vga_stride=%d\n", vga_state.vga_stride);
 }