--- np2/sdl/np2.c	2004/01/05 07:22:02	1.2
+++ np2/sdl/np2.c	2004/03/28 10:50:16	1.6
@@ -20,7 +20,7 @@
 #include	"s98.h"
 #include	"diskdrv.h"
 #include	"timing.h"
-#include	"statsave.h"
+#include	"keystat.h"
 #include	"vramhdl.h"
 #include	"menubase.h"
 #include	"sysmenu.h"
@@ -82,11 +82,11 @@ static int flagload(const char *ext, con
 	getstatfilename(path, ext, sizeof(path));
 	id = DID_YES;
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		menumbox("Couldn't restart", title, MBOX_OK | MBOX_ICONSTOP);
 		id = DID_NO;
 	}
-	else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		SPRINTF(buf2, "Conflict!\n\n%s\nContinue?", buf);
 		id = menumbox(buf2, title, MBOX_YESNOCAN | MBOX_ICONQUESTION);
 	}
@@ -142,7 +142,7 @@ int SDL_main(int argc, char **argv) {
 	}
 	sdlkbd_initialize();
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 	if (sysmenu_create() != SUCCESS) {
 		goto np2main_err3;