--- np2/bios/bios18.c	2004/03/14 23:45:43	1.33
+++ np2/bios/bios18.c	2004/06/02 11:02:53	1.36
@@ -8,8 +8,6 @@
 #include	"font.h"
 
 
-static	int		sti_waiting = 0;
-
 typedef struct {
 	BYTE	GBON_PTN;
 	BYTE	GBBCC;
@@ -476,7 +474,7 @@ void bios0x18_42(REG8 mode) {
 	scrn = bios0x18_31bh();
 	if ((mem[MEMB_CRT_BIOS] & 0x80) &&
 		(((scrn & 0x30) == 0x30) || (crtmode == 3))) {
-		bios0x18_30(rate, (crtmode << 4) + 1);
+		bios0x18_30(rate, (REG8)((crtmode << 4) + 1));
 	}
 	else {
 #endif
@@ -628,7 +626,8 @@ static void bios0x18_47(void) {
 		vect.ope = 0x20 + (ucw.GBDSP & 7);
 		vect.DC[0] = ucw.GBLNG1[0];
 		vect.DC[1] = ucw.GBLNG1[1];
-		data = LOADINTELWORD(ucw.GBLNG2) - 1;
+//		data = LOADINTELWORD(ucw.GBLNG2) - 1;
+		data = LOADINTELWORD(ucw.GBCIR) - 1;
 		STOREINTELWORD(vect.D, data);
 		data >>= 1;
 		STOREINTELWORD(vect.D2, data);
@@ -768,17 +767,6 @@ void bios0x18(void) {
 							MEML_READ16(CPU_SS, CPU_SP)));
 #endif
 
-	sti_waiting ^= 1;
-	if (sti_waiting) {					// 割込み許可の遊び
-		CPU_STI;
-		if (PICEXISTINTR) {
-			CPU_IP--;
-			nevent_forceexit();
-			return;
-		}
-	}
-	sti_waiting = 0;
-
 	switch(CPU_AH) {
 		case 0x00:						// キー・データの読みだし
 			if (mem[MEMB_KB_COUNT]) {
@@ -945,12 +933,10 @@ void bios0x18(void) {
 				if (tmp.r8 == 0x05) {
 					CPU_AL = 0;
 					CPU_BH = 0;
-					TRACEOUT(("success"));
 				}
 				else {
 					CPU_AL = 1;
 					CPU_BH = 1;
-					TRACEOUT(("failure"));
 				}
 			}
 			break;