--- np2/x11/np2.c	2003/12/19 16:08:01	1.8
+++ np2/x11/np2.c	2004/05/25 14:06:10	1.17
@@ -31,13 +31,13 @@
 #include "pccore.h"
 #include "dosio.h"
 #include "scrndraw.h"
-#include "statsave.h"
 #include "timing.h"
 #include "toolkit.h"
 
 #include "kdispwin.h"
 #include "toolwin.h"
 #include "viewer.h"
+#include "debugwin.h"
 
 #include "commng.h"
 #include "joymng.h"
@@ -60,7 +60,7 @@ NP2OSCFG np2oscfg = {
 	0,			/* paddingy */
 
 	0,			/* NOWAIT */
-	2,			/* DRAW_SKIP */
+	0,			/* DRAW_SKIP */
 
 	0,			/* DISPCLK */
 
@@ -73,6 +73,11 @@ NP2OSCFG np2oscfg = {
 	{ 0, 0, 0, 0 },		/* JOY1BTN */
 
 	{ COMPORT_MIDI, 0, 0x3e, 19200, "", "", "", "" },	/* mpu */
+	{
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com1 */
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com2 */
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com3 */
+	},
 
 	0,			/* confirm */
 
@@ -82,6 +87,7 @@ NP2OSCFG np2oscfg = {
 	0,			/* toolwin */
 	0,			/* keydisp */
 	0,			/* hostdrv_write */
+	0,			/* jastsnd */
 	0,			/* I286SAVE */
 
 	SNDDRV_NODRV,		/* snddrv */
@@ -126,6 +132,11 @@ char statpath[MAX_PATH];
 #endif
 char fontname[1024] = FONTFACE;
 
+#ifndef	FONTNAME_DEFAULT
+#define	FONTNAME_DEFAULT	"./default.ttf"
+#endif
+char fontfilename[MAX_PATH] = FONTNAME_DEFAULT;
+
 char timidity_cfgfile_path[MAX_PATH];
 
 BOOL use_shared_pixmap;
@@ -196,10 +207,10 @@ flagload(const char* ext, const char* ti
 
 	getstatfilename(path, ext, sizeof(path));
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		fprintf(stderr, "Couldn't restart\n");
 		rv = 1;
-	} else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		fprintf(stderr, "Conflict\n");
 		rv = 1;
 	}
@@ -270,6 +281,7 @@ framereset(UINT cnt)
 	kdispwin_draw((BYTE)cnt);
 	toolwin_draw((BYTE)cnt);
 	viewer_allreload(FALSE);
+	debugwin_process();
 	if (np2oscfg.DISPCLK & 3) {
 		if (sysmng_workclockrenewal()) {
 			sysmng_updatecaption(3);
@@ -356,7 +368,7 @@ mainloop(void *p)
 	return TRUE;
 }
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 int mmxflag;
 
 int
@@ -387,4 +399,4 @@ havemmx(void)
 
 	return rv;
 }
-#endif
+#endif /* GCC_CPU_ARCH_IA32 */