X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ffontgfx.c;h=2abb13ffe93dfa88a15c9b88a486a67c169c7177;hb=8d77030556e776f864e8e95bcbb5684ce2916d44;hp=34154f06002364ceb2930c71c2f1f39f90f58d9a;hpb=fbe125254951c226754f1445fe42cb5b42d74cbd;p=16.git

diff --git a/src/fontgfx.c b/src/fontgfx.c
old mode 100644
new mode 100755
index 34154f06..2abb13ff
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -25,13 +25,14 @@
 //#include "lib/16text.h"
 #include "lib/modex16.h"
 
+global_game_variables_t gvar;
+
 void main(int argc, char near *argv[])
 {
 	//JMOJI
 	static byte e;
 	//word ri;
 	byte pee[2];
-	page_t screen;
 	static byte ibmlogo[]="IIIIIII  BBBBBBBBB    MMMMM       MMMMM\n\
 IIIIIII  BBBBBBBBBBB  MMMMMM     MMMMMM\n\
   III     BBB    BBB   MMMMMM   MMMMMM\n\
@@ -62,11 +63,12 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 //	static byte *rosa;
 	static word chx, chy, colpee;
 	textInit();
-	modexEnter();
+	VGAmodeX(1, 1, &gvar);
 	/* setup camera and screen~ */
-	screen = modexDefaultPage();
-	screen.width += (16*2);
-	screen.height += (16*2);
+	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]);
 	//modexprint(16, 16, 1, 15, "wwww");
 	//getch();
 	chx=0;
@@ -74,15 +76,15 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 	colpee=32;
 	for(e=0x00; e<=0xFE; e++)
 	{
-		if(chx+8>(SCREEN_WIDTH/2)-16)
+		if(chx+8>(gvar.video.page[0].width/2))
 		{
 			chx=0;
 			chy+=8;
 			sprintf(pee,"%u", colpee);
-			modexprint(&screen, 200, 200, 1, 47, 0, &pee);
+			modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 1);
 			//getch();
 		}
-		modexprint(&screen, chx, chy, 1, 0, colpee, &e);
+		modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 1);
 		chx+=9;
 		colpee++;
 		if(colpee>=32+24) colpee=32;
@@ -90,10 +92,11 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 	//modexprint(100, 100, 1, 47, 0, "wwww");
 	getch();
 //	modexprint(0, 0, 1, 0, colpee, &rose);
-	modexprint(&screen, 0, 0, 0, 0, colpee, &ibmlogo);
+//++++	modexprint(&gvar.video.page[0], 0, 0, 0, 0, colpee, &ibmlogo);
+//	modexprintbig(&gvar.video.page[0], 0, 0, 1, colpee, 0, "IBM");
 //	modexprint(0, 0, 1, 0, colpee, ROSE);
 	getch();
-	modexLeave();
+	VGAmodeX(0, 1, &gvar);
 //	rosa=malloc(sizeof(ROSE));
 //	(*rosa)=(byte)ROSE;
 	printf("\n%s\n", rose);