np2/win9x/sstpmsg.cpp - diff

Return to sstpmsg.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x

Diff for /np2/win9x/sstpmsg.cpp between versions 1.3 and 1.6

version 1.3, 2004/02/18 02:03:37	version 1.6, 2005/02/07 14:46:14
Line 7	Line 7
#include "sstpres.h"	#include "sstpres.h"
#include "pccore.h"	#include "pccore.h"
#include "iocore.h"	#include "iocore.h"
#include "bios.h"
#include "sound.h"	#include "sound.h"
#include "fmboard.h"	#include "fmboard.h"
#include "np2info.h"	#include "np2info.h"
Line 18 static char cr[] = "\\n";	Line 17 static char cr[] = "\\n";

// ---- np2info extend	// ---- np2info extend

#ifdef __cplusplus
extern "C" {
#endif
extern RHYTHMCFG rhythmcfg;
#ifdef __cplusplus
}
#endif

static const char str_jwinclr[] =	static const char str_jwinclr[] =
"256色\0ハイカラー\0フルカラー\0トゥルーカラー";	"256色\0ハイカラー\0フルカラー\0トゥルーカラー";
static const char str_jwinmode[] =	static const char str_jwinmode[] =
Line 99 static void info_jdisp(char *str, int ma	Line 90 static void info_jdisp(char *str, int ma
static void info_jbios(char str, int maxlen, NP2INFOEX ex) {	static void info_jbios(char str, int maxlen, NP2INFOEX ex) {

str[0] = '\0';	str[0] = '\0';
if (biosrom) {	if (pccore.rom & PCROM_BIOS) {
milstr_ncat(str, str_biosrom, maxlen);	milstr_ncat(str, str_biosrom, maxlen);
}	}
if (soundrom.name[0]) {	if (soundrom.name[0]) {
Line 117 static void info_jrhythm(char *str, int	Line 108 static void info_jrhythm(char *str, int

const char *p;	const char *p;
char jrhythmstr[16];	char jrhythmstr[16];
UINT rhythmfault;	UINT exist;
UINT i;	UINT i;

if (!(usesound & 0x6c)) {	if (!(usesound & 0x6c)) {
p = "不要やで";	p = "不要やで";
}	}
else {	else {
milstr_ncpy(jrhythmstr, "BSCHTRや", sizeof(jrhythmstr));	exist = rhythm_getcaps();
rhythmfault = 0;	if (exist == 0) {
for (i=0; i<6; i++) {	p = "用意されてないんか…";
if (rhythmcfg.pcm[i].data == NULL) {
jrhythmstr[i] = '_';
rhythmfault++;
}
}	}
if (!rhythmfault) {	else if (exist == 0x3f) {
p = "全部あるで";	p = "全部あるで";
}	}
else if (rhythmfault == 6) {
p = "用意されてないんか…";
}
else {	else {
	milstr_ncpy(jrhythmstr, "BSCHTRや", sizeof(jrhythmstr));
	for (i=0; i<6; i++) {
	if (!(exist & (1 << i))) {
	jrhythmstr[i] = '_';
	}
	}
p = jrhythmstr;	p = jrhythmstr;
}	}
}	}
Line 163 const INFOPROC *inf;	Line 153 const INFOPROC *inf;
const INFOPROC *infterm;	const INFOPROC *infterm;

inf = infoproc;	inf = infoproc;
infterm = infoproc + (sizeof(infoproc) / sizeof(INFOPROC));	infterm = infoproc + NELEMENTS(infoproc);
while(inf < infterm) {	while(inf < infterm) {
if (!milstr_cmp(key, inf->key)) {	if (!milstr_cmp(key, inf->key)) {
inf->proc(dst, maxlen, ex);	inf->proc(dst, maxlen, ex);
Line 179 static const NP2INFOEX sstpex = {"\\n",	Line 169 static const NP2INFOEX sstpex = {"\\n",

// ----	// ----

static const BYTE prs2[] = {0xaa,0xac,0xae,0xb0,0xb2,0xbe,0xf0,0x9f,	static const UINT8 prs2[] = {0xaa,0xac,0xae,0xb0,0xb2,0xbe,0xf0,0x9f,
0xa1,0xa3,0xa5,0xa7,0xe1,0xe3,0xe5,0xc1,	0xa1,0xa3,0xa5,0xa7,0xe1,0xe3,0xe5,0xc1,
0xb8,0xa0,0xa2,0xa4,0xa6,0xa8,0xa9,0xab,	0xb8,0xa0,0xa2,0xa4,0xa6,0xa8,0xa9,0xab,
0xad,0xaf,0xb1,0xb3,0xb5,0xb7,0xb9,0xbb,	0xad,0xaf,0xb1,0xb3,0xb5,0xb7,0xb9,0xbb,
0xbd,0xbf,0xc2,0xc4,0xc6,0xc8,0xc9,0xca,	0xbd,0xbf,0xc2,0xc4,0xc6,0xc8,0xc9,0xca,
0xcb,0xcc,0xcd,0xd0,0xd3,0xd6,0xd9,0xdc,	0xcb,0xcc,0xcd,0xd0,0xd3,0xd6,0xd9,0xdc,
0xdd,0xde,0xdf,0xe0,0xe2,0xe4,0xe6,0xe7,	0xdd,0xde,0xdf,0xe0,0xe2,0xe4,0xe6,0xe7,
0xe8,0xe9,0xea,0xeb,0xed,0xf1,0xb4,0xb8};	0xe8,0xe9,0xea,0xeb,0xed,0xf1,0xb4,0xb8};

#define GETSSTPDAT1(a) { \	#define GETSSTPDAT1(a) { \
(a) = last; \	(a) = last; \
Line 197 static const BYTE prs2[] = {0xaa,0xac,0x	Line 187 static const BYTE prs2[] = {0xaa,0xac,0x

static char sstpsolve(char buf, const unsigned char *dat) {	static char sstpsolve(char buf, const unsigned char *dat) {

BYTE c;	UINT8 c;
BYTE last;	UINT8 last;

last = 0x80;	last = 0x80;
while(1) {	while(1) {
Line 226 static char sstpsolve(char buf, const	Line 216 static char sstpsolve(char buf, const
*buf++ = c;	*buf++ = c;
}	}
else if (c == 0x7f) {	else if (c == 0x7f) {
BYTE ms;	UINT8 ms;
GETSSTPDAT1(ms);	GETSSTPDAT1(ms);
if (!ms) {	if (!ms) {
break;	break;
Line 242 static char sstpsolve(char buf, const	Line 232 static char sstpsolve(char buf, const
}	}
}	}
else if (c == 0x80) {	else if (c == 0x80) {
BYTE c2;	UINT8 c2;
GETSSTPDAT1(c2);	GETSSTPDAT1(c2);
if (c2) {	if (c2) {
*buf++ = c2;	*buf++ = c2;
Line 253 static char sstpsolve(char buf, const	Line 243 static char sstpsolve(char buf, const
}	}
else if (c >= 0xf0) {	else if (c >= 0xf0) {
int i;	int i;
const BYTE *p;	const UINT8 *p;
i = c - 0xf0;	i = c - 0xf0;
if (c == 0xff) {	if (c == 0xff) {
BYTE c2;	UINT8 c2;
GETSSTPDAT1(c2);	GETSSTPDAT1(c2);
if (!c2) {	if (!c2) {
break;	break;
Line 270 static char sstpsolve(char buf, const	Line 260 static char sstpsolve(char buf, const
buf = sstpsolve(buf, p);	buf = sstpsolve(buf, p);
}	}
else if ((c >= 0xa0) && (c < 0xe0)) {	else if ((c >= 0xa0) && (c < 0xe0)) {
*buf++ = (BYTE)0x82;	*buf++ = (UINT8)0x82;
*buf++ = prs2[c-0xa0];	*buf++ = prs2[c-0xa0];
}	}
else {	else {
BYTE c2;	UINT8 c2;
GETSSTPDAT1(c2);	GETSSTPDAT1(c2);
if (c2) {	if (c2) {
*buf++ = c;	*buf++ = c;

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.3
changed lines
	Added in v.1.6