X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ffonttes0.c;h=30229dae346f4fd674c0438f9f4bc3bf6451e529;hb=663e52d5641538fc75ccdad3ba2529a27e8e0ff8;hp=740aa7d1b287a04692426a7b551a5e3837f5080f;hpb=53d15c0cbdab9c174d3f3fc191dceb8c1bea3d7a;p=16.git

diff --git a/src/fonttes0.c b/src/fonttes0.c
old mode 100644
new mode 100755
index 740aa7d1..30229dae
--- a/src/fonttes0.c
+++ b/src/fonttes0.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.
  *
@@ -22,9 +22,11 @@
 #include <stdio.h>
 #include <conio.h>
 #include "lib/types.h"
-#include "lib/16text.h"
+#include "lib/16text.h"
 #include "lib/modex16.h"
 
+global_game_variables_t gvar;
+
 void main(int argc, char near *argv[])
 {
     int i, xp;
@@ -32,9 +34,9 @@ void main(int argc, char near *argv[])
 	char l[16];
     char c,ct;
     word s, o, t, w;
-    word addr = (word) l;
-    //byte *pal, *pal2, fond;
-	//bitmap_t fontdata;
+    word addr = (word) l;
+    //byte *pal, *pal2, fond;
+	//bitmap_t fontdata;
 	page_t page;
     textInit();
 
@@ -45,9 +47,9 @@ void main(int argc, char near *argv[])
     }
 
 //	printf("*argv[1]=%d\n", *argv[1]);
-
+
 	printf("Font type: ");
-	gets(&ct);
+	gets(&ct);
 
 	printf("Character: ");
 	gets(&c);
@@ -55,37 +57,37 @@ void main(int argc, char near *argv[])
 	if(ct!=1)
 	switch(ct)
 	{
-		case 48:
+		case 48:
 			printf("type 0\n");
 			t=0;
 			w=14;
 		break;
-		case 49:
+		case 49:
 			printf("type 1\n");
 			t=1;
 			w=8;
 		break;
-		case 50:
+		case 50:
 			printf("type 2\n");
 			t=2;
 			w=8;
 		break;
-		case 51:
+		case 51:
 			printf("type 3\n");
 			t=3;
 			w=16;
 		break;
-		default:
+		default:
 			printf("type 3\n");
 			t=3;
 			w=16;
 		break;
 	}
 	else
-	{
+	{
 		printf("type 3\n");
 		t=3;
-		w=16;	
+		w=16;
 	}
 
 
@@ -108,31 +110,31 @@ void main(int argc, char near *argv[])
 		INC DI
 		DEC CX
 		JNZ L1
-    }
-
+    }
+
     //load our palette
-    //modexLoadPalFile("data/default.pal", &pal2);
-
-	/*fontdata.width=8;
-	fontdata.height=w;
-	fontdata.palette=pal2;
-
-	fontdata.data=malloc(256);
-
-	for(i=0; i<w; i++)
+    //modexLoadPalFile("data/default.pal", &pal2);
+
+	/*fontdata.width=8;
+	fontdata.height=w;
+	fontdata.palette=pal2;
+
+	fontdata.data=malloc(256);
+
+	for(i=0; i<w; i++)
 	{
 		j=1<<8;
-		while(j)
-		{
-			fond=(byte)l[i] & j ? '1':'0';
-			fontdata.data=&(fond);
+		while(j)
+		{
+			fond=(byte)l[i] & j ? '1':'0';
+			fontdata.data=&(fond);
 			printf("%02x ", *(fontdata.data));
 			j>>=1;
-		}
+		}
 		printf("\n");
-	}
-
-	printf("\n\nok hit a key~\n");
+	}
+
+	printf("\n\nok hit a key~\n");
 	while(!getch())
 	{
 		//DrawPBuf(&page, 0, 0, p, 0);
@@ -144,65 +146,68 @@ void main(int argc, char near *argv[])
     modexFadeOff(4, pal);
     modexPalBlack();
 */
-    modexEnter();
+    VGAmodeX(1, &gvar);
 /*    modexPalBlack();*/
 
     // set up the page, but with 16 pixels on all borders in offscreen mem
     page=modexDefaultPage();
     //page.width += 32;
-    //page.height += 32;
-	modexShowPage(&page);
-	modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);
+    //page.height += 32;
+	modexShowPage(&page);
+	modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);
 	// fade in
-	//modexFadeOn(4, pal2);
-
+	//modexFadeOn(4, pal2);
+
 	//render the letter in ascii art
-	for(i=0; i<w; i++)
+	for(i=0; i<w; i++)
 	{
-		j=1<<8;
+		j=1<<8;
 		xp=0;
-		while(j)
-		{
+		while(j)
+		{
 			//printf("j=%d\n", j);
-			//printf("%c", l[i] & j ? '*':' ');
-			//====printf("%02x ", l[i] & j);
-			//printf("l[i]=%d	", l[i]);
-			//printf("j=%d	", j);
-			//printf("%02x\n", l[i] & j);
-				modexClearRegion(&page, xp, i*4, 4, 4, l[i] & j ? 15:0);
-//while(!getch());
-			xp+=4;
-			j>>=1;
+			//printf("%c", l[i] & j ? '*':' ');
+			//====printf("%02x ", l[i] & j);
+			//printf("l[i]=%d	", l[i]);
+			//printf("j=%d	", j);
+			//printf("%02x\n", l[i] & j);
+				//modexPutPixel(xp, i, l[i] & j ? 15:0);
+				//modexpixelwr(xp, i, 0, l[i] & j ? 15:0);
+				modexputPixel(&page, xp, i, l[i] & j ? 15:0);
+				//modexClearRegion(&page, xp*4, i*4, 4, 4, l[i] & j ? 15:0);
+//while(!getch());
+			xp++;
+			j>>=1;
 		}
-		//====
-		//printf("\n");
-	}
-	//modexDrawSprite(&page, 0, 0, &fontdata);
+		//====
+		//printf("\n");
+	}
+	//modexDrawSprite(&page, 0, 0, &fontdata);
 	while(!getch())
 	{
 		//DrawPBuf(&page, 0, 0, p, 0);
-	}
-
+	}
+
 	// fade back to text mode
 	/*modexFadeOff(4, pal2);
 	modexPalBlack();*/
-	modexLeave();
+	VGAmodeX(0, &gvar);
 	/*modexPalBlack();
-	modexFadeOn(4, pal);*/
+	modexFadeOn(4, pal);*/
 	//render the letter in ascii art
-	for(i=0; i<w; i++)
+	for(i=0; i<w; i++)
 	{
 		j=1<<8;
-		while(j)
-		{
-			printf("%c", l[i] & j ? '*':' ');
-			//====printf("%02x ", l[i] & j);
-//while(!getch());
-		j>>=1;
+		while(j)
+		{
+			printf("%c", l[i] & j ? '*':' ');
+			//====printf("%02x ", l[i] & j);
+//while(!getch());
+		j>>=1;
 		}
-		printf("\n");
-	}
-	printf("\ni=%d\n", i);
-	printf("j=%d\n", j);
-
+		printf("\n");
+	}
+	printf("\ni=%d\n", i);
+	printf("j=%d\n", j);
+
 }