--- np2/io/gdc_sub.c	2004/02/02 12:16:30	1.7
+++ np2/io/gdc_sub.c	2004/02/11 04:22:18	1.9
@@ -16,17 +16,22 @@ enum {
 typedef struct {
 	SINT16	x;
 	SINT16	y;
-	SINT16	sx;
-	SINT16	sy;
-} TEXTDIR;
+	SINT16	x2;
+	SINT16	y2;
+} VECTDIR;
 
 static	UINT16	gdc_rt[RT_TABLEMAX+1];
 
-static const TEXTDIR textdir[8] = {
+static const VECTDIR vectdir[16] = {
 					{ 0, 1, 1, 0}, { 1, 1, 1,-1},
 					{ 1, 0, 0,-1}, { 1,-1,-1,-1},
 					{ 0,-1,-1, 0}, {-1,-1,-1, 1},
-					{-1, 0, 0, 1}, {-1, 1, 1, 1}};
+					{-1, 0, 0, 1}, {-1, 1, 1, 1},
+
+					{ 0, 1, 1, 1}, { 1, 1, 1, 0},		// SL
+					{ 1, 0, 1,-1}, { 1,-1, 0,-1},
+					{ 0,-1,-1,-1}, {-1,-1,-1, 0},
+					{-1, 0,-1, 1}, {-1, 1, 0, 1}};
 
 
 void gdcsub_init(void) {
@@ -64,12 +69,20 @@ static void calc_gdcslavewait(UINT dots)
 	nevent_set(NEVENT_GDCSLAVE, clk, gdcslavewait, NEVENT_ABSOLUTE);
 }
 
-void gdcsub_line(UINT32 csrw, const GDCVECT *vect, UINT16 pat, BYTE ope) {
+void gdcsub_null(UINT32 csrw, const GDCVECT *vect, REG16 pat, REG8 ope) {
+
+	(void)csrw;
+	(void)vect;
+	(void)pat;
+	(void)ope;
+}
+
+void gdcsub_line(UINT32 csrw, const GDCVECT *vect, REG16 pat, REG8 ope) {
 
 	_GDCPSET	pset;
 	UINT		dc;
-	UINT16		x;
-	UINT16		y;
+	REG16		x;
+	REG16		y;
 	UINT		i;
 	UINT16		step;
 	UINT		d1;
@@ -87,56 +100,56 @@ void gdcsub_line(UINT32 csrw, const GDCV
 			case 0:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, (UINT16)(x + step), y++);
+					gdcpset(&pset, (REG16)(x + step), y++);
 				}
 				break;
 
 			case 1:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, x++, (UINT16)(y + step));
+					gdcpset(&pset, x++, (REG16)(y + step));
 				}
 				break;
 
 			case 2:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, x++, (UINT16)(y - step));
+					gdcpset(&pset, x++, (REG16)(y - step));
 				}
 				break;
 
 			case 3:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, (UINT16)(x + step), y--);
+					gdcpset(&pset, (REG16)(x + step), y--);
 				}
 				break;
 
 			case 4:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, (UINT16)(x - step), y--);
+					gdcpset(&pset, (REG16)(x - step), y--);
 				}
 				break;
 
 			case 5:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, x--, (UINT16)(y - step));
+					gdcpset(&pset, x--, (REG16)(y - step));
 				}
 				break;
 
 			case 6:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, x--, (UINT16)(y + step));
+					gdcpset(&pset, x--, (REG16)(y + step));
 				}
 				break;
 
 			case 7:
 				for (i=0; i<=dc; i++) {
 					step = (UINT16)((((d1 * i) / dc) + 1) >> 1);
-					gdcpset(&pset, (UINT16)(x - step), y++);
+					gdcpset(&pset, (REG16)(x - step), y++);
 				}
 				break;
 		}
@@ -144,14 +157,15 @@ void gdcsub_line(UINT32 csrw, const GDCV
 	calc_gdcslavewait(pset.dots);
 }
 
-void gdcsub_box(UINT32 csrw, const GDCVECT *vect, UINT16 pat, BYTE ope) {
+void gdcsub_box(UINT32 csrw, const GDCVECT *vect, REG16 pat, REG8 ope) {
 
 	_GDCPSET	pset;
 	UINT		d;
 	UINT		d2;
-	UINT16		x;
-	UINT16		y;
+	REG16		x;
+	REG16		y;
 	UINT		i;
+const VECTDIR	*dir;
 
 	gdcpset_prepare(&pset, csrw, pat, ope);
 	d = (LOADINTELWORD(vect->D)) & 0x3fff;
@@ -159,71 +173,31 @@ void gdcsub_box(UINT32 csrw, const GDCVE
 	x = pset.x;
 	y = pset.y;
 	// 回転はなしよ(手抜き)
-	switch((vect->ope) & 7) {
-		case 0:
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x, y++);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x++, y);
-			}
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x, y--);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x--, y);
-			}
-			break;
-
-		case 2:
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x++, y);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x, y--);
-			}
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x--, y);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x, y++);
-			}
-			break;
-
-		case 4:
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x, y--);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x--, y);
-			}
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x, y++);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x++, y);
-			}
-			break;
-
-		case 6:
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x--, y);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x, y++);
-			}
-			for (i=0; i<d; i++) {
-				gdcpset(&pset, x++, y);
-			}
-			for (i=0; i<d2; i++) {
-				gdcpset(&pset, x, y--);
-			}
-			break;
+	dir = vectdir + ((vect->ope) & 7);
+	for (i=0; i<d; i++) {
+		gdcpset(&pset, x, y);
+		x += dir->x;
+		y += dir->y;
+	}
+	for (i=0; i<d2; i++) {
+		gdcpset(&pset, x, y);
+		x += dir->x2;
+		y += dir->y2;
+	}
+	for (i=0; i<d; i++) {
+		gdcpset(&pset, x, y);
+		x -= dir->x;
+		y -= dir->y;
+	}
+	for (i=0; i<d2; i++) {
+		gdcpset(&pset, x, y);
+		x -= dir->x2;
+		y -= dir->y2;
 	}
 	calc_gdcslavewait(pset.dots);
 }
 
-void gdcsub_circle(UINT32 csrw, const GDCVECT *vect, UINT16 pat, BYTE ope) {
+void gdcsub_circle(UINT32 csrw, const GDCVECT *vect, REG16 pat, REG8 ope) {
 
 	_GDCPSET	pset;
 	UINT		r;
@@ -253,7 +227,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x + s), (UINT16)(y + i));
+					gdcpset(&pset, (REG16)(x + s), (REG16)(y + i));
 				}
 				break;
 
@@ -261,7 +235,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x + i), (UINT16)(y + s));
+					gdcpset(&pset, (REG16)(x + i), (REG16)(y + s));
 				}
 				break;
 
@@ -269,7 +243,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x + i), (UINT16)(y - s));
+					gdcpset(&pset, (REG16)(x + i), (REG16)(y - s));
 				}
 				break;
 
@@ -277,7 +251,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x + s), (UINT16)(y - i));
+					gdcpset(&pset, (REG16)(x + s), (REG16)(y - i));
 				}
 				break;
 
@@ -285,7 +259,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x - s), (UINT16)(y - i));
+					gdcpset(&pset, (REG16)(x - s), (REG16)(y - i));
 				}
 				break;
 
@@ -293,7 +267,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x - i), (UINT16)(y - s));
+					gdcpset(&pset, (REG16)(x - i), (REG16)(y - s));
 				}
 				break;
 
@@ -301,7 +275,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x - i), (UINT16)(y + s));
+					gdcpset(&pset, (REG16)(x - i), (REG16)(y + s));
 				}
 				break;
 
@@ -309,7 +283,7 @@ void gdcsub_circle(UINT32 csrw, const GD
 				for (; i<=t; i++) {
 					s = (gdc_rt[(i << RT_TABLEBIT) / m] * r);
 					s = (s + (1 << (RT_MULBIT - 1))) >> RT_MULBIT;
-					gdcpset(&pset, (UINT16)(x - s), (UINT16)(y + i));
+					gdcpset(&pset, (REG16)(x - s), (REG16)(y + i));
 				}
 				break;
 		}
@@ -317,31 +291,42 @@ void gdcsub_circle(UINT32 csrw, const GD
 	calc_gdcslavewait(pset.dots);
 }
 
-void gdcsub_text(UINT32 csrw, const GDCVECT *vect, UINT16 pat, BYTE ope) {
+void gdcsub_text(UINT32 csrw, const GDCVECT *vect, const BYTE *pat,
+																REG8 ope) {
 
 	_GDCPSET	pset;
 	BYTE		multiple;
 	UINT		sx;
 	UINT		sy;
-const TEXTDIR	*dir;
+const VECTDIR	*dir;
 	UINT		patnum;
 	BYTE		muly;
-	UINT16		cx;
-	UINT16		cy;
+	REG16		cx;
+	REG16		cy;
 	UINT		xrem;
 	BYTE		bit;
 	BYTE		mulx;
 
-	gdcpset_prepare(&pset, csrw, pat, ope);
+	gdcpset_prepare(&pset, csrw, 0xffff, ope);
 	multiple = (gdc.s.para[GDC_ZOOM] & 15) + 1;
-#if 0
-	sx = (LOADINTELWORD(vect->DC)) & 0x3fff) + 1;
-	sy = (LOADINTELWORD(vect->D)) & 0x3fff) + 1;
+#if 1
+	sy = LOADINTELWORD(vect->DC);
+	sy = (sy & 0x3fff) + 1;
+	sx = LOADINTELWORD(vect->D);
+	sx = ((sx - 1) & 0x3fff) + 1;
+
+	// てきとーにリミット
+	if (sx >= 768) {
+		sx = 768;
+	}
+	if (sy >= 768) {
+		sy = 768;
+	}
 #else
 	sx = 8;
 	sy = 8;
 #endif
-	dir = textdir + ((vect->ope) & 7);
+	dir = vectdir + (((vect->ope & 0x80) >> 4) + ((vect->ope) & 7));
 	patnum = 0;
 
 	while(sy--) {
@@ -350,7 +335,7 @@ const TEXTDIR	*dir;
 		while(muly--) {
 			cx = pset.x;
 			cy = pset.y;
-			bit = gdc.s.para[GDC_TEXTW + (patnum & 7)];
+			bit = pat[patnum & 7];
 			xrem = sx;
 			while(xrem--) {
 				mulx = multiple;
@@ -371,8 +356,8 @@ const TEXTDIR	*dir;
 					}
 				}
 			}
-			pset.x += dir->sx;
-			pset.y += dir->sy;
+			pset.x += dir->x2;
+			pset.y += dir->y2;
 		}
 	}
 	calc_gdcslavewait(pset.dots);