--- np2/win9x/sstpmsg.cpp	2004/02/18 02:03:37	1.3
+++ np2/win9x/sstpmsg.cpp	2004/06/04 16:11:03	1.5
@@ -7,7 +7,6 @@
 #include	"sstpres.h"
 #include	"pccore.h"
 #include	"iocore.h"
-#include	"bios.h"
 #include	"sound.h"
 #include	"fmboard.h"
 #include	"np2info.h"
@@ -18,14 +17,6 @@ static char cr[] = "\\n";
 
 // ---- np2info extend
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern	RHYTHMCFG	rhythmcfg;
-#ifdef __cplusplus
-}
-#endif
-
 static const char str_jwinclr[] =
 						"256色\0ハイカラー\0フルカラー\0トゥルーカラー";
 static const char str_jwinmode[] =
@@ -99,7 +90,7 @@ static void info_jdisp(char *str, int ma
 static void info_jbios(char *str, int maxlen, NP2INFOEX *ex) {
 
 	str[0] = '\0';
-	if (biosrom) {
+	if (pccore.rom & PCROM_BIOS) {
 		milstr_ncat(str, str_biosrom, maxlen);
 	}
 	if (soundrom.name[0]) {
@@ -117,28 +108,27 @@ static void info_jrhythm(char *str, int 
 
 const char	*p;
 	char	jrhythmstr[16];
-	UINT	rhythmfault;
+	UINT	exist;
 	UINT	i;
 
 	if (!(usesound & 0x6c)) {
 		p = "不要やで";
 	}
 	else {
-		milstr_ncpy(jrhythmstr, "BSCHTRや", sizeof(jrhythmstr));
-		rhythmfault = 0;
-		for (i=0; i<6; i++) {
-			if (rhythmcfg.pcm[i].data == NULL) {
-				jrhythmstr[i] = '_';
-				rhythmfault++;
-			}
+		exist = rhythm_getcaps();
+		if (exist == 0) {
+			p = "用意されてないんか…";
 		}
-		if (!rhythmfault) {
+		else if (exist == 0x3f) {
 			p = "全部あるで";
 		}
-		else if (rhythmfault == 6) {
-			p = "用意されてないんか…";
-		}
 		else {
+			milstr_ncpy(jrhythmstr, "BSCHTRや", sizeof(jrhythmstr));
+			for (i=0; i<6; i++) {
+				if (!(exist & (1 << i))) {
+					jrhythmstr[i] = '_';
+				}
+			}
 			p = jrhythmstr;
 		}
 	}