--- xmil/vram/make24.c	2004/08/07 07:19:56	1.1
+++ xmil/vram/make24.c	2004/08/10 08:28:49	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"
@@ -9,10 +8,6 @@
 #include	"font.h"
 
 
-extern	BYTE	dispflg;
-extern	BYTE	*dispp;
-
-
 void width80x25_200h(void) {								// 80x25 200line
 
 	UINT	fontcy;
@@ -29,7 +24,7 @@ const UINT8	*src;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -38,12 +33,12 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			if (udtmp & makescrn.dispflag) {
+				updatetmp[pos] = (UINT8)(udtmp & (~makescrn.dispflag));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
 				makechr16(work, pos, fontcy, udtmp);
-				src = dispp + (pos << 5);
+				src = makescrn.disp1 + (pos << 5);
 				makemix_mix(dst, SURFACE_WIDTH * 2, work, src, fontcy);
 				makemix_mix(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
 									work + MAKETEXT_STEP, src, fontcy);
@@ -91,7 +86,7 @@ const UINT8	*src;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -154,7 +149,7 @@ const UINT8	*src;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -163,12 +158,12 @@ const UINT8	*src;
 		x = makescrn.surfcx;
 		do {
 			udtmp = updatetmp[pos];
-			if (udtmp & dispflg) {
-				updatetmp[pos] = (UINT8)(udtmp & (~dispflg));
+			if (udtmp & makescrn.dispflag) {
+				updatetmp[pos] = (UINT8)(udtmp & (~makescrn.dispflag));
 				newline = TRUE;
 				ZeroMemory(work, sizeof(work));
 				makechr16(work, pos, fontcy, udtmp);
-				src = dispp + (LOW10(pos) << 5);
+				src = makescrn.disp1 + (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);
@@ -217,7 +212,7 @@ const UINT8	*src;
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -283,7 +278,7 @@ void width80x20h(void) {
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;
@@ -345,7 +340,7 @@ void width80x10h(void) {
 	UINT	i;
 
 	fontcy = min(makescrn.fontcy, MAKETEXT_ROW);
-	pos = crtc.s.TXT_TOP;
+	pos = makescrn.vramtop;
 	dst = screenmap;
 	newline = FALSE;
 	y = makescrn.surfcy;