--- xmil/vram/make15.c	2004/08/07 07:19:56	1.1
+++ xmil/vram/make15.c	2004/08/08 09:12:06	1.3
@@ -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"
@@ -24,12 +23,11 @@ void width80x25_200l(void) {								// 8
 	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;
@@ -42,10 +40,10 @@ void width80x25_200l(void) {								// 8
 				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
-				skipline = makechr8(work, pos, fontcy, udtmp);
+				makechr8(work, pos, fontcy, udtmp);
 				makemix_mix(dst, SURFACE_WIDTH * 2,
 									work, dispp + (pos << 5), fontcy);
-				makemix_doubler(dst, fontcy, skipline);
+				makemix_doubler(dst, fontcy, 0x40404040);
 				if (fontcy < makescrn.fontcy) {
 					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
@@ -85,13 +83,12 @@ void width80x12_200l(void) {								// 8
 	UINT	x;
 	REG8	udtmp;
 	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;
@@ -104,12 +101,12 @@ const UINT8	*src;
 				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
-				skipline = makechr16(work, pos, fontcy, udtmp);
+				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);
+				makemix_doubler(dst, fontcy * 2, 0x40404040);
 				if (fontcy < makescrn.fontcy) {
 					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
 				}
@@ -149,12 +146,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;
@@ -167,9 +163,9 @@ void width80x20l(void) {
 				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TRAM));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
-				skipline = makechr8(work, pos, fontcy, udtmp);
+				makechr8(work, pos, fontcy, udtmp);
 				makemix_txt(dst, SURFACE_WIDTH * 2, work, fontcy);
-				makemix_doubler(dst, fontcy, skipline);
+				makemix_doubler(dst, fontcy, 0x40404040);
 				if (fontcy < makescrn.fontcy) {
 					makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);
 				}
@@ -211,12 +207,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;
@@ -229,11 +224,11 @@ void width80x10l(void) {
 				updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TRAM));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
-				skipline = makechr16(work, pos, fontcy, udtmp);
+				makechr16(work, pos, fontcy, udtmp);
 				makemix_txt(dst, SURFACE_WIDTH * 4, work, fontcy);
 				makemix_txt(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
 											work + MAKETEXT_STEP, fontcy);
-				makemix_doubler(dst, fontcy * 2, skipline);
+				makemix_doubler(dst, fontcy * 2, 0x40404040);
 				if (fontcy < makescrn.fontcy) {
 					makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);
 				}