np2/font/fontfm7.c - diff

Return to fontfm7.c CVS log

Up to [RetroPC.NET] / np2 / font

Diff for /np2/font/fontfm7.c between versions 1.1 and 1.5

version 1.1, 2003/10/16 17:58:36	version 1.5, 2005/02/07 14:46:10
Line 1	Line 1
#include "compiler.h"	#include "compiler.h"
#include "dosio.h"	#include "dosio.h"
#include "memory.h"	#include "cpucore.h"
#include "font.h"	#include "font.h"
#include "fontdata.h"	#include "fontdata.h"


static void fm7ankcpy(BYTE dst, const BYTE src, int from, int to) {	static void fm7ankcpy(UINT8 dst, const UINT8 src, int from, int to) {

int y;	int y;
const BYTE *p;	const UINT8 *p;
int ank;	int ank;

for (ank=from; ank<to; ank++) {	for (ank=from; ank<to; ank++) {
Line 22 const BYTE *p;	Line 22 const BYTE *p;
}	}
}	}

static void fm7knjcpy(BYTE dst, const BYTE src, int from, int to) {	static void fm7knjcpy(UINT8 dst, const UINT8 src, int from, int to) {

int i, j, k;	int i, j, k;
const BYTE *p;	const UINT8 *p;
BYTE *q;	UINT8 *q;

for (i=from; i<to; i++) {	for (i=from; i<to; i++) {
q = dst + 0x21000 + (i << 4);	q = dst + 0x21000 + (i << 4);
Line 66 const BYTE *p;	Line 66 const BYTE *p;
}	}
}	}

BYTE fontfm7_read(const char *filename, BYTE loading) {	UINT8 fontfm7_read(const char *filename, UINT8 loading) {

FILEH fh;	FILEH fh;
BYTE *work;	UINT8 *work;
char fname[MAX_PATH];	char fname[MAX_PATH];

work = (BYTE *)_MALLOC(0x20000, "fm7font");	work = (UINT8 *)_MALLOC(0x20000, "fm7font");
if (work == NULL) {	if (work == NULL) {
goto frf7_err1;	goto frf7_err1;
}	}
Line 86 BYTE fontfm7_read(const char *filename,	Line 86 BYTE fontfm7_read(const char *filename,
if (fh != FILEH_INVALID) {	if (fh != FILEH_INVALID) {
if (file_read(fh, work, 2048) == 2048) {	if (file_read(fh, work, 2048) == 2048) {
loading &= ~FONT_ANK8;	loading &= ~FONT_ANK8;
CopyMemory(font + 0x82100, work + 0x100, 0x60*8);	fontdata_ank8store(work + 0x100, 0x20, 0x60);
CopyMemory(font + 0x82500, work + 0x500, 0x40*8);	fontdata_ank8store(work + 0x500, 0xa0, 0x40);
}	}
file_close(fh);	file_close(fh);
}	}
Line 104 BYTE fontfm7_read(const char *filename,	Line 104 BYTE fontfm7_read(const char *filename,
// 16dot ASCIIを読み込む？	// 16dot ASCIIを読み込む？
if (loading & FONT_ANK16a) {	if (loading & FONT_ANK16a) {
loading &= ~FONT_ANK16a;	loading &= ~FONT_ANK16a;
fm7ankcpy(font + 0x80200, work, 0x20, 0x7f);	fm7ankcpy(fontrom + 0x80200, work, 0x20, 0x7f);
fontdata_patch16a();	fontdata_patch16a();
}	}

// 第一水準漢字を読み込む？	// 第一水準漢字を読み込む？
if (loading & FONT_KNJ1) {	if (loading & FONT_KNJ1) {
loading &= ~FONT_KNJ1;	loading &= ~FONT_KNJ1;
fm7knjcpy(font, work, 0x01, 0x30);	fm7knjcpy(fontrom, work, 0x01, 0x30);
fontdata_patchjis();	fontdata_patchjis();
}	}
}	}

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

Removed from v.1.1
changed lines
	Added in v.1.5