--- np2/io/mouseif.c	2003/10/16 17:57:55	1.1.1.1
+++ np2/io/mouseif.c	2003/10/19 14:56:15	1.3
@@ -1,5 +1,6 @@
 #include	"compiler.h"
 #include	"mousemng.h"
+#include	"i286.h"
 #include	"pccore.h"
 #include	"iocore.h"
 
@@ -20,8 +21,7 @@ void mouseif_sync(void) {
 	mouseif.rx = mouseif.sx;
 	mouseif.ry = mouseif.sy;
 
-	mouseif.lastc = nevent.clock + nevent.baseclock
-											- nevent.remainclock;
+	mouseif.lastc = I286_CLOCK + I286_BASECLOCK + I286_REMCLOCK;
 }
 
 static void calc_mousexy(void) {
@@ -29,13 +29,14 @@ static void calc_mousexy(void) {
 	UINT32	clock;
 	SINT32	diff;
 
-	clock = nevent.clock + nevent.baseclock - nevent.remainclock;
+	clock = I286_CLOCK + I286_BASECLOCK + I286_REMCLOCK;
 	diff = clock - mouseif.lastc;
 	if (diff >= 2000) {
-		short dx, dy;
+		SINT16 dx;
+		SINT16 dy;
 		mouseif.rapid ^= 0xa0;
 		diff /= 1000;
-		dx = (short)((long)mouseif.sx * diff / (long)pc.frame1000);
+		dx = (SINT16)(mouseif.sx * diff / pc.frame1000);
 		if (dx >= 0) {											// ˵
 			if (dx > mouseif.rx) {
 				dx = mouseif.rx;
@@ -48,7 +49,7 @@ static void calc_mousexy(void) {
 		}
 		mouseif.x += dx;
 		mouseif.rx -= dx;
-		dy = (short)((long)mouseif.sy * diff / (long)pc.frame1000);
+		dy = (SINT16)(mouseif.sy * diff / pc.frame1000);
 		if (dy >= 0) {											// ˵
 			if (dy > mouseif.ry) {
 				dy = mouseif.ry;