--- np2/i286c/v30patch.c	2004/08/15 11:17:58	1.8
+++ np2/i286c/v30patch.c	2005/03/05 06:02:29	1.10
@@ -5,8 +5,11 @@
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
-#include	"dmap.h"
+#include	"dmav30.h"
 #include	"i286c.mcr"
+#if defined(ENABLE_TRAP)
+#include	"steptrap.h"
+#endif
 
 
 // victory30 patch
@@ -812,23 +815,32 @@ void v30c(void) {
 
 	if (I286_TRAP) {
 		do {
+#if defined(ENABLE_TRAP)
+			steptrap(CPU_CS, CPU_IP);
+#endif
 			GET_PCBYTE(opcode);
 			v30op[opcode]();
 			if (I286_TRAP) {
 				i286c_interrupt(1);
 			}
-			dmap_v30();
+			dmav30();
 		} while(I286_REMCLOCK > 0);
 	}
 	else if (dmac.working) {
 		do {
+#if defined(ENABLE_TRAP)
+			steptrap(CPU_CS, CPU_IP);
+#endif
 			GET_PCBYTE(opcode);
 			v30op[opcode]();
-			dmap_v30();
+			dmav30();
 		} while(I286_REMCLOCK > 0);
 	}
 	else {
 		do {
+#if defined(ENABLE_TRAP)
+			steptrap(CPU_CS, CPU_IP);
+#endif
 			GET_PCBYTE(opcode);
 			v30op[opcode]();
 		} while(I286_REMCLOCK > 0);
@@ -849,6 +861,6 @@ void v30c_step(void) {
 	if (I286_OV) {
 		I286_FLAG |= (O_FLAG);
 	}
-	dmap_v30();
+	dmav30();
 }