--- np2/win9x/debuguty/viewsnd.cpp	2003/10/16 17:59:11	1.1
+++ np2/win9x/debuguty/viewsnd.cpp	2005/02/07 15:39:27	1.5
@@ -1,6 +1,6 @@
 #include	"compiler.h"
-#include	"resource.h"
 #include	"strres.h"
+#include	"resource.h"
 #include	"np2.h"
 #include	"viewer.h"
 #include	"viewcmn.h"
@@ -84,7 +84,7 @@ static void viewsnd_paint(NP2VIEW_T *vie
 
 	hfont = CreateFont(16, 0, 0, 0, 0, 0, 0, 0, 
 					SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-					DEFAULT_QUALITY, FIXED_PITCH, "£Í£Ó¥´¥·¥Ã¥¯");
+					DEFAULT_QUALITY, FIXED_PITCH, np2viewfont);
 	SetTextColor(hdc, 0xffffff);
 	SetBkColor(hdc, 0x400000);
 	hfont = (HFONT)SelectObject(hdc, hfont);
@@ -106,8 +106,7 @@ static void viewsnd_paint(NP2VIEW_T *vie
 	}
 
 	pos = view->pos;
-	for (y=0; y<rc->bottom && pos<sizeof(fmsndtbl)/sizeof(FMSNDTBL);
-															y+=16, pos++) {
+	for (y=0; (y<rc->bottom) && (pos<NELEMENTS(fmsndtbl)); y+=16, pos++) {
 		if (fmsndtbl[pos].str) {
 			TextOut(hdc, 0, y, fmsndtbl[pos].str, strlen(fmsndtbl[pos].str));
 		}
@@ -176,7 +175,8 @@ LRESULT CALLBACK viewsnd_proc(NP2VIEW_T 
 void viewsnd_init(NP2VIEW_T *dst, NP2VIEW_T *src) {
 
 	dst->type = VIEWMODE_SND;
-	dst->maxline = sizeof(fmsndtbl)/sizeof(FMSNDTBL);
+	dst->maxline = NELEMENTS(fmsndtbl);
 	dst->mul = 1;
 	dst->pos = 0;
 }
+