xmil/vram/make24.c - diff

Return to make24.c CVS log

Up to [RetroPC.NET] / xmil / vram

Diff for /xmil/vram/make24.c between versions 1.2 and 1.5

version 1.2, 2004/08/07 10:53:01	version 1.5, 2004/08/18 09:17:56
Line 8	Line 8
#include "font.h"	#include "font.h"


extern BYTE dispflg;
extern BYTE *dispp;


void width80x25_200h(void) { // 80x25 200line	void width80x25_200h(void) { // 80x25 200line

UINT fontcy;	UINT fontcy;
Line 22 void width80x25_200h(void) { // 8	Line 18 void width80x25_200h(void) { // 8
UINT8 *lp;	UINT8 *lp;
UINT x;	UINT x;
REG8 udtmp;	REG8 udtmp;
	REG8 dirty;
UINT8 work[MAKETEXT_STEP * 2];	UINT8 work[MAKETEXT_STEP * 2];
const UINT8 *src;	const UINT8 *src;
UINT lines;	UINT lines;
Line 37 const UINT8 *src;	Line 34 const UINT8 *src;
x = makescrn.surfcx;	x = makescrn.surfcx;
do {	do {
udtmp = updatetmp[pos];	udtmp = updatetmp[pos];
if (udtmp & dispflg) {	dirty = udtmp & makescrn.dispflag;
updatetmp[pos] = (UINT8)(udtmp & (~dispflg));	if (dirty) {
	updatetmp[pos] = (UINT8)(udtmp ^ dirty);
newline = TRUE;	newline = TRUE;
ZeroMemory(work, sizeof(work));	if (dirty & UPDATE_TRAM) {
makechr16(work, pos, fontcy, udtmp);	ZeroMemory(work, sizeof(work));
src = dispp + (pos << 5);	makechr16(work, pos, fontcy, udtmp);
makemix_mix(dst, SURFACE_WIDTH * 2, work, src, fontcy);	makemix_mixtext(dst, SURFACE_WIDTH * 2, work, fontcy);
makemix_mix(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,	makemix_mixtext(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
work + MAKETEXT_STEP, src, fontcy);	work + MAKETEXT_STEP, fontcy);
	}
	if (dirty & UPDATE_VRAM) {
	src = makescrn.disp1 + (pos << 5);
	makemix_mixgrph(dst, SURFACE_WIDTH * 2, src, fontcy);
	makemix_mixgrph(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
	src, fontcy);
	}
if (fontcy < makescrn.fontcy) {	if (fontcy < makescrn.fontcy) {
makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);	makemix_cpy400(dst, fontcy * 2, makescrn.fontcy * 2);
}	}
}	}
pos = LOW11(pos + 1);	pos = LOW11(pos + 1);
Line 99 const UINT8 *src;	Line 104 const UINT8 *src;
x = makescrn.surfcx;	x = makescrn.surfcx;
do {	do {
udtmp = updatetmp[pos];	udtmp = updatetmp[pos];
if (udtmp & UPDATE_VRAM) {	if (udtmp & UPDATE_TVRAM) {
updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_VRAM));	updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TVRAM));
newline = TRUE;	newline = TRUE;
ZeroMemory(work, sizeof(work));	if (udtmp & UPDATE_TRAM) {
makechr16(work, pos, fontcy, udtmp);	ZeroMemory(work, sizeof(work));
src = GRP_RAM + (pos << 5);	makechr16(work, pos, fontcy, udtmp);
makemix_mix(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 2,	makemix_mixtext(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 2,
work, src + GRAM_BANK0, fontcy);	work, fontcy);
makemix_mix(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 2,	makemix_mixtext(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 2,
work + MAKETEXT_STEP, src + GRAM_BANK1, fontcy);	work + MAKETEXT_STEP, fontcy);
	}
	src = gram + (pos << 5);
	if (udtmp & UPDATE_VRAM0) {
	makemix_mixgrph(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 2,
	src + GRAM_BANK0, fontcy);
	}
	if (udtmp & UPDATE_VRAM1) {
	makemix_mixgrph(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 2,
	src + GRAM_BANK1, fontcy);
	}
if (fontcy < makescrn.fontcy) {	if (fontcy < makescrn.fontcy) {
makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);	makemix_cpy400(dst, fontcy * 2, makescrn.fontcy * 2);
}	}
}	}
pos = LOW11(pos + 1);	pos = LOW11(pos + 1);
Line 147 void width80x12_200h(void) { // 8	Line 162 void width80x12_200h(void) { // 8
UINT8 *lp;	UINT8 *lp;
UINT x;	UINT x;
REG8 udtmp;	REG8 udtmp;
	REG8 dirty;
UINT8 work[MAKETEXT_STEP * 2];	UINT8 work[MAKETEXT_STEP * 2];
const UINT8 *src;	const UINT8 *src;
UINT lines;	UINT lines;
Line 162 const UINT8 *src;	Line 178 const UINT8 *src;
x = makescrn.surfcx;	x = makescrn.surfcx;
do {	do {
udtmp = updatetmp[pos];	udtmp = updatetmp[pos];
if (udtmp & dispflg) {	dirty = udtmp & makescrn.dispflag;
updatetmp[pos] = (UINT8)(udtmp & (~dispflg));	if (dirty) {
	updatetmp[pos] = (UINT8)(udtmp ^ dirty);
newline = TRUE;	newline = TRUE;
ZeroMemory(work, sizeof(work));	if (dirty & UPDATE_TRAM) {
makechr16(work, pos, fontcy, udtmp);	ZeroMemory(work, sizeof(work));
src = dispp + (LOW10(pos) << 5);	makechr16(work, pos, fontcy, udtmp);
makemix_mix(dst, SURFACE_WIDTH * 4, work, src, fontcy);	makemix_mixtext(dst, SURFACE_WIDTH * 4, work, fontcy);
makemix_mix(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,	makemix_mixtext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
work + MAKETEXT_STEP, src + GRAM_HALFSTEP, fontcy);	work + MAKETEXT_STEP, fontcy);
makemix_doubler(dst, fontcy * 2, 0);	}
	if (dirty & UPDATE_VRAM) {
	src = makescrn.disp1 + (LOW10(pos) << 5);
	makemix_mixgrph(dst, SURFACE_WIDTH * 4, src, fontcy);
	makemix_mixgrph(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
	src + GRAM_HALFSTEP, fontcy);
	}
	// makemix_doubler(dst, fontcy * 2, 0);
if (fontcy < makescrn.fontcy) {	if (fontcy < makescrn.fontcy) {
makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);	makemix_cpy200(dst, fontcy * 2, makescrn.fontcy * 2);
}	}
}	}
pos = LOW11(pos + 1);	pos = LOW11(pos + 1);
Line 225 const UINT8 *src;	Line 249 const UINT8 *src;
x = makescrn.surfcx;	x = makescrn.surfcx;
do {	do {
udtmp = updatetmp[pos];	udtmp = updatetmp[pos];
if (udtmp & UPDATE_VRAM) {	if (udtmp & UPDATE_TVRAM) {
updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_VRAM));	updatetmp[pos] = (UINT8)(udtmp & (~UPDATE_TVRAM));
newline = TRUE;	newline = TRUE;
ZeroMemory(work, sizeof(work));	if (udtmp & UPDATE_TRAM) {
makechr16(work, pos, fontcy, udtmp);	ZeroMemory(work, sizeof(work));
src = GRP_RAM + (LOW10(pos) << 5);	makechr16(work, pos, fontcy, udtmp);
makemix_mix(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 4,	makemix_mixtext(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 4,
work, src + GRAM_BANK0L, fontcy);	work, fontcy);
makemix_mix(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 4,	makemix_mixtext(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 4,
work, src + GRAM_BANK1L, fontcy);	work, fontcy);
makemix_mix(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,	makemix_mixtext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
work + MAKETEXT_STEP, src + GRAM_BANK0H, fontcy);	work + MAKETEXT_STEP, fontcy);
makemix_mix(dst + SURFACE_WIDTH * 3, SURFACE_WIDTH * 4,	makemix_mixtext(dst + SURFACE_WIDTH * 3, SURFACE_WIDTH * 4,
work + MAKETEXT_STEP, src + GRAM_BANK1H, fontcy);	work + MAKETEXT_STEP, fontcy);
	}
	src = gram + (LOW10(pos) << 5);
	if (udtmp & UPDATE_VRAM0) {
	makemix_mixgrph(dst + SURFACE_WIDTH * 0, SURFACE_WIDTH * 4,
	src + GRAM_BANK0L, fontcy);
	makemix_mixgrph(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
	src + GRAM_BANK0H, fontcy);
	}
	if (udtmp & UPDATE_VRAM1) {
	makemix_mixgrph(dst + SURFACE_WIDTH * 1, SURFACE_WIDTH * 4,
	src + GRAM_BANK1L, fontcy);
	makemix_mixgrph(dst + SURFACE_WIDTH * 3, SURFACE_WIDTH * 4,
	src + GRAM_BANK1H, fontcy);
	}
if (fontcy < makescrn.fontcy) {	if (fontcy < makescrn.fontcy) {
makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);	makemix_cpy400(dst, fontcy * 4, makescrn.fontcy * 4);
}	}
}	}
pos = LOW11(pos + 1);	pos = LOW11(pos + 1);
Line 296 void width80x20h(void) {	Line 334 void width80x20h(void) {
newline = TRUE;	newline = TRUE;
ZeroMemory(work, sizeof(work));	ZeroMemory(work, sizeof(work));
makechr16(work, pos, fontcy, udtmp);	makechr16(work, pos, fontcy, udtmp);
makemix_txt(dst, SURFACE_WIDTH * 2, work, fontcy);	makemix_settext(dst, SURFACE_WIDTH * 2, work, fontcy);
makemix_txt(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,	makemix_settext(dst + SURFACE_WIDTH, SURFACE_WIDTH * 2,
work + MAKETEXT_STEP, fontcy);	work + MAKETEXT_STEP, fontcy);
if (fontcy < makescrn.fontcy) {	if (fontcy < makescrn.fontcy) {
makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2);	makemix_cpy400(dst, fontcy * 2, makescrn.fontcy * 2);
}	}
makemix_ul20(dst + SURFACE_WIDTH * makescrn.fontcy * 2,	makemix_ul20(dst + SURFACE_WIDTH * makescrn.fontcy * 2, pos);
pos, 0);
}	}
pos = LOW11(pos + 1);	pos = LOW11(pos + 1);
dst += 8;	dst += 8;
Line 358 void width80x10h(void) {	Line 395 void width80x10h(void) {
newline = TRUE;	newline = TRUE;
ZeroMemory(work, sizeof(work));	ZeroMemory(work, sizeof(work));
makechr16(work, pos, fontcy, udtmp);	makechr16(work, pos, fontcy, udtmp);
makemix_txt(dst, SURFACE_WIDTH * 4, work, fontcy);	makemix_settext(dst, SURFACE_WIDTH * 4, work, fontcy);
makemix_txt(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,	makemix_settext(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4,
work + MAKETEXT_STEP, fontcy);	work + MAKETEXT_STEP, fontcy);
makemix_doubler(dst, fontcy * 2, 0);
if (fontcy < makescrn.fontcy) {	if (fontcy < makescrn.fontcy) {
makemix_remcpy(dst, fontcy * 4, makescrn.fontcy * 4);	makemix_cpy200(dst, fontcy * 2, makescrn.fontcy * 2);
}	}
makemix_ul10(dst + SURFACE_WIDTH * makescrn.fontcy * 4,	makemix_ul10(dst + SURFACE_WIDTH * makescrn.fontcy * 4, pos);
pos, 0);
}	}
pos = LOW11(pos + 1);	pos = LOW11(pos + 1);
dst += 8;	dst += 8;

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

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