--- xmil/vram/make15.c	2004/08/07 07:19:56	1.1
+++ xmil/vram/make15.c	2005/02/04 06:42:12	1.6
@@ -1,7 +1,6 @@
 #include	"compiler.h"
 #include	"scrnmng.h"
 #include	"pccore.h"
-#include	"iocore.h"
 #include	"vram.h"
 #include	"scrndraw.h"
 #include	"makescrn.h"
@@ -9,10 +8,6 @@
 #include	"font.h"
 
 
-extern	BYTE	dispflg;
-extern	BYTE	*dispp;
-
-
 void width80x25_200l(void) {								// 80x25 200line
 
 	UINT	fontcy;
@@ -23,13 +18,13 @@ void width80x25_200l(void) {								// 8
 	UINT8	*lp;
 	UINT	x;
 	REG8	udtmp;
+	REG8	dirty;
 	UINT8	work[MAKETEXT_ROW * 3];
-	UINT32	skipline;
 	UINT	lines;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -37,17 +32,22 @@ void width80x25_200l(void) {								// 8
 	do {
 		x = makescrn.surfcx;
 		do {
-			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			udtmp = TRAMUPDATE(pos);
+			dirty = (udtmp & makescrn.dispflag);
+			if (dirty) {
+				TRAMUPDATE(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 + TRAM2GRAM(pos), fontcy);
+				}
 				if (fontcy < makescrn.fontcy) {
-					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
+					makemix_cpy200(dst, fontcy, makescrn.fontcy);
 				}
 			}
 			pos = LOW11(pos + 1);
@@ -55,7 +55,7 @@ void width80x25_200l(void) {								// 8
 		} while(--x);
 
 		pos = LOW11(pos + makescrn.surfrx);
-		if (updatetmp[LOW11(pos - 1)] & 4) {			// 縦倍角描画だったら
+		if (TRAMUPDATE(LOW11(pos - 1)) & 4) {			// 縦倍角描画だったら
 			makescrn.fontycnt += makescrn.charcy;
 		}
 		else {
@@ -84,14 +84,14 @@ 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;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -99,19 +99,26 @@ const UINT8	*src;
 	do {
 		x = makescrn.surfcx;
 		do {
-			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			udtmp = TRAMUPDATE(pos);
+			dirty = (udtmp & makescrn.dispflag);
+			if (dirty) {
+				TRAMUPDATE(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 + TRAM2GRAM(LOW10(pos));
+					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);
@@ -119,7 +126,7 @@ const UINT8	*src;
 		} while(--x);
 
 		pos = LOW11(pos + makescrn.surfrx);
-		if (updatetmp[LOW11(pos - 1)] & 4) {			// 縦倍角描画だったら
+		if (TRAMUPDATE(LOW11(pos - 1)) & 4) {			// 縦倍角描画だったら
 			makescrn.fontycnt += makescrn.charcy;
 		}
 		else {
@@ -149,12 +156,11 @@ void width80x20l(void) {
 	UINT	x;
 	REG8	udtmp;
 	UINT8	work[MAKETEXT_ROW * 3];
-	UINT32	skipline;
 	UINT	lines;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -162,26 +168,24 @@ void width80x20l(void) {
 	do {
 		x = makescrn.surfcx;
 		do {
-			udtmp = updatetmp[pos];
+			udtmp = TRAMUPDATE(pos);
 			if (udtmp & UPDATE_TRAM) {
-				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TRAM));
+				TRAMUPDATE(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;
 		} while(--x);
 
 		pos = LOW11(pos + makescrn.surfrx);
-		if (updatetmp[LOW11(pos - 1)] & 4) {			// 縦倍角描画だったら
+		if (TRAMUPDATE(LOW11(pos - 1)) & 4) {			// 縦倍角描画だったら
 			makescrn.fontycnt += makescrn.charcy;
 		}
 		else {
@@ -211,12 +215,11 @@ void width80x10l(void) {
 	UINT	x;
 	REG8	udtmp;
 	UINT8	work[MAKETEXT_STEP * 2];
-	UINT32	skipline;
 	UINT	lines;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -224,28 +227,26 @@ void width80x10l(void) {
 	do {
 		x = makescrn.surfcx;
 		do {
-			udtmp = updatetmp[pos];
+			udtmp = TRAMUPDATE(pos);
 			if (udtmp & UPDATE_TRAM) {
-				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TRAM));
+				TRAMUPDATE(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;
 		} while(--x);
 
 		pos = LOW11(pos + makescrn.surfrx);
-		if (updatetmp[LOW11(pos - 1)] & 4) {			// 縦倍角描画だったら
+		if (TRAMUPDATE(LOW11(pos - 1)) & 4) {			// 縦倍角描画だったら
 			makescrn.fontycnt += makescrn.charcy;
 		}
 		else {