--- xmil/vram/make15.c	2004/08/07 10:53:01	1.2
+++ xmil/vram/make15.c	2004/08/18 09:17:56	1.5
@@ -8,10 +8,6 @@
 #include	"font.h"
 
 
-extern	BYTE	dispflg;
-extern	BYTE	*dispp;
-
-
 void width80x25_200l(void) {								// 80x25 200line
 
 	UINT	fontcy;
@@ -22,8 +18,8 @@ void width80x25_200l(void) {								// 8
 	UINT8	*lp;
 	UINT	x;
 	REG8	udtmp;
+	REG8	dirty;
 	UINT8	work[MAKETEXT_ROW * 3];
-	UINT32	skipline;
 	UINT	lines;
 	UINT	i;
 
@@ -37,16 +33,21 @@ void width80x25_200l(void) {								// 8
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			dirty = (udtmp & makescrn.dispflag);
+			if (dirty) {
+				updatetmp[pos] = (UINT8)(udtmp ^ dirty);
 				newline = TRUE;
-				ZeroMemory(work, sizeof(work));
-				skipline = makechr8(work, pos, fontcy, udtmp);
-				makemix_mix(dst, SURFACE_WIDTH * 2,
-									work, dispp + (pos << 5), fontcy);
-				makemix_doubler(dst, fontcy, skipline);
+				if (dirty & UPDATE_TRAM) {
+					ZeroMemory(work, sizeof(work));
+					makechr8(work, pos, fontcy, udtmp);
+					makemix_mixtext(dst, SURFACE_WIDTH * 2, work, fontcy);
+				}
+				if (dirty & UPDATE_VRAM) {
+					makemix_mixgrph(dst, SURFACE_WIDTH * 2,
+									makescrn.disp1 + (pos << 5), fontcy);
+				}
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
+					makemix_cpy200(dst, fontcy, makescrn.fontcy);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -83,8 +84,8 @@ void width80x12_200l(void) {								// 8
 	UINT8	*lp;
 	UINT	x;
 	REG8	udtmp;
+	REG8	dirty;
 	UINT8	work[MAKETEXT_STEP * 2];
-	UINT32	skipline;
 const UINT8	*src;
 	UINT	lines;
 	UINT	i;
@@ -99,18 +100,25 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			dirty = (udtmp & makescrn.dispflag);
+			if (dirty) {
+				updatetmp[pos] = (UINT8)(udtmp ^ dirty);
 				newline = TRUE;
-				ZeroMemory(work, sizeof(work));
-				skipline = makechr16(work, pos, fontcy, udtmp);
-				src = dispp + (LOW10(pos) << 5);
-				makemix_mix(dst, SURFACE_WIDTH * 4, work, src, fontcy);
-				makemix_mix(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
-							work + MAKETEXT_STEP, src + GRAM_HALFSTEP, fontcy);
-				makemix_doubler(dst, fontcy * 2, skipline);
+				if (dirty & UPDATE_TRAM) {
+					ZeroMemory(work, sizeof(work));
+					makechr16(work, pos, fontcy, udtmp);
+					makemix_mixtext(dst, SURFACE_WIDTH * 4, work, fontcy);
+					makemix_mixtext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+											work + MAKETEXT_STEP, fontcy);
+				}
+				if (dirty & UPDATE_VRAM) {
+					src = makescrn.disp1 + (LOW10(pos) << 5);
+					makemix_mixgrph(dst, SURFACE_WIDTH * 4, src, fontcy);
+					makemix_mixgrph(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+											src + GRAM_HALFSTEP, fontcy);
+				}
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
+					makemix_cpy200(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -148,7 +156,6 @@ void width80x20l(void) {
 	UINT	x;
 	REG8	udtmp;
 	UINT8	work[MAKETEXT_ROW * 3];
-	UINT32	skipline;
 	UINT	lines;
 	UINT	i;
 
@@ -166,14 +173,12 @@ void width80x20l(void) {
 				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TRAM));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
-				skipline = makechr8(work, pos, fontcy, udtmp);
-				makemix_txt(dst, SURFACE_WIDTH * 2, work, fontcy);
-				makemix_doubler(dst, fontcy, skipline);
+				makechr8(work, pos, fontcy, udtmp);
+				makemix_settext(dst, SURFACE_WIDTH * 2, work, fontcy);
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
+					makemix_cpy200(dst, fontcy, makescrn.fontcy);
 				}
-				makemix_ul20(dst + SURFACE_WIDTH * makescrn.fontcy * 2,
-															pos, 0x40404040);
+				makemix_ul20(dst + SURFACE_WIDTH * makescrn.fontcy * 2, pos);
 			}
 			pos = LOW11(pos + 1);
 			dst += 8;
@@ -210,7 +215,6 @@ void width80x10l(void) {
 	UINT	x;
 	REG8	udtmp;
 	UINT8	work[MAKETEXT_STEP * 2];
-	UINT32	skipline;
 	UINT	lines;
 	UINT	i;
 
@@ -228,16 +232,14 @@ void width80x10l(void) {
 				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TRAM));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
-				skipline = makechr16(work, pos, fontcy, udtmp);
-				makemix_txt(dst, SURFACE_WIDTH * 4, work, fontcy);
-				makemix_txt(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
+				makechr16(work, pos, fontcy, udtmp);
+				makemix_settext(dst, SURFACE_WIDTH * 4, work, fontcy);
+				makemix_settext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
 											work + MAKETEXT_STEP, fontcy);
-				makemix_doubler(dst, fontcy * 2, skipline);
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
+					makemix_cpy200(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
-				makemix_ul10(dst + SURFACE_WIDTH * makescrn.fontcy * 4,
-															pos, 0x40404040);
+				makemix_ul10(dst + SURFACE_WIDTH * makescrn.fontcy * 4, pos);
 			}
 			pos = LOW11(pos + 1);
 			dst += 8;