--- xmil/vram/makemix.c	2004/08/18 09:17:56	1.4
+++ xmil/vram/makemix.c	2005/02/04 06:42:12	1.5
@@ -52,7 +52,7 @@ void makemix_mixgrph(UINT8 *dst, UINT al
 		datr |= TO256COLR(dat, 2);
 		*(UINT32 *)(dst + 0) = datl;
 		*(UINT32 *)(dst + 4) = datr;
-		pos = (pos + 1) & 7;
+		pos = (pos + GRAM_LINESTEP) & (GRAM_LINESTEP * 7);
 		dst += align;
 	} while(--count);
 }
@@ -85,7 +85,7 @@ void makemix_ul20(UINT8 *dst, UINT pos) 
 
 	UINT32	dat;
 
-	dat = (tram[TRAM_KNJ + pos] & TRAMKNJ_ULINE)?0x01010101:0x00000000;
+	dat = (TRAM_KNJ(pos) & TRAMKNJ_ULINE)?0x01010101:0x00000000;
 	*(UINT32 *)(dst + (SURFACE_WIDTH * 0) + 0) = dat;
 	*(UINT32 *)(dst + (SURFACE_WIDTH * 0) + 4) = dat;
 	*(UINT32 *)(dst + (SURFACE_WIDTH * 1) + 0) = dat;
@@ -100,7 +100,7 @@ void makemix_ul10(UINT8 *dst, UINT pos) 
 
 	UINT32	dat;
 
-	dat = (tram[TRAM_KNJ + pos] & TRAMKNJ_ULINE)?0x01010101:0x00000000;
+	dat = (TRAM_KNJ(pos) & TRAMKNJ_ULINE)?0x01010101:0x00000000;
 	*(UINT32 *)(dst + (SURFACE_WIDTH * 0) + 0) = dat;
 	*(UINT32 *)(dst + (SURFACE_WIDTH * 0) + 4) = dat;
 //	*(UINT32 *)(dst + (SURFACE_WIDTH * 1) + 0) = dat;
@@ -142,68 +142,3 @@ void makemix_cpy400(UINT8 *dst, UINT pos
 	} while(--count);
 }
 
-
-
-
-
-
-
-
-#if 0
-void makemix_mix(UINT8 *dst, UINT align,
-							const UINT8 *txt, const UINT8 *grp, UINT count) {
-
-	REG8	dat;
-	UINT32	datl;
-	UINT32	datr;
-
-	do {
-		dat = txt[MAKETEXT_ROW * 0];
-		datl = TO256COLL(dat, 3);
-		datr = TO256COLR(dat, 3);
-		dat = txt[MAKETEXT_ROW * 1];
-		datl |= TO256COLL(dat, 4);
-		datr |= TO256COLR(dat, 4);
-		dat = txt[MAKETEXT_ROW * 2];
-		datl |= TO256COLL(dat, 5);
-		datr |= TO256COLR(dat, 5);
-		dat = grp[GRAM_B];
-		datl |= TO256COLL(dat, 0);
-		datr |= TO256COLR(dat, 0);
-		dat = grp[GRAM_R];
-		datl |= TO256COLL(dat, 1);
-		datr |= TO256COLR(dat, 1);
-		dat = grp[GRAM_G];
-		datl |= TO256COLL(dat, 2);
-		datr |= TO256COLR(dat, 2);
-		*(UINT32 *)(dst + 0) = datl;
-		*(UINT32 *)(dst + 4) = datr;
-		txt++;
-		grp++;
-		dst += align;
-	} while(--count);
-}
-
-void makemix_doubler(UINT8 *dst, UINT count, UINT32 skipline) {
-
-	do {
-		*(UINT32 *)(dst + SURFACE_WIDTH + 0)
-										= (*(UINT32 *)(dst + 0)) + skipline;
-		*(UINT32 *)(dst + SURFACE_WIDTH + 4)
-										= (*(UINT32 *)(dst + 4)) + skipline;
-		dst += SURFACE_WIDTH * 2;
-	} while(--count);
-}
-
-void makemix_remcpy(UINT8 *dst, UINT pos, UINT count) {
-
-	count -= pos;
-	pos = pos * SURFACE_WIDTH;
-	do {
-		*(UINT32 *)(dst + pos + 0) = *(UINT32 *)(dst + 0);
-		*(UINT32 *)(dst + pos + 4) = *(UINT32 *)(dst + 4);
-		dst += SURFACE_WIDTH;
-	} while(--count);
-}
-#endif
-