Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-22 18:32:42 +01:00
Code Issues Projects Releases Wiki Activity

- fixed font character display when symbols are not present

Browse Source
This commit is contained in:
Ilya Shurumov 2021-02-19 13:08:02 +06:00
parent d33b147a75
commit 222c983fc2
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src_rebuild/Game/C/pres.c
View File

@ -47,7 +47,7 @@ char AsciiTable[256] = { 0 };
OUT_FONTINFO fontinfo[128];
// [D] [T]
void SetTextColour(unsigned char Red, unsigned char Green, unsigned char Blue)
void SetTextColour(u_char Red, u_char Green, u_char Blue)
{
gFontColour.r = Red;
gFontColour.g = Green;
@ -72,7 +72,7 @@ int StringWidth(char *pString)
w += 4;
else if ((let + 128 & 0xff) < 11)
w += 24;
else if (AsciiTable[let] != 0xff)
else if (AsciiTable[let] != -1)
w += fontinfo[AsciiTable[let]].width;
}
@ -135,18 +135,22 @@ void LoadFont(char *buffer)
file = _frontend_buffer; // 0x11b400; // [A] FIXME: this font address might be used somewhere else
Loadfile("GFX\\FONT2.FNT",file);
nchars = *(int *)file;
file += sizeof(int);
// copy character info
memcpy((u_char*)fontinfo,file + 4,nchars * sizeof(OUT_FONTINFO));
memcpy((u_char*)fontinfo,file,nchars * sizeof(OUT_FONTINFO));
file += sizeof(int) + nchars * 8;
file += nchars * sizeof(OUT_FONTINFO);
memcpy((u_char*)AsciiTable, file, 256);
file += 256;
fontclutid = GetClut(fontclutpos.x,fontclutpos.y);
i = 0;
clut = (ushort*)(file + 0x100);
clut = (ushort*)file;
do {
*clut++ &= 0x7fff;
i++;
@ -162,8 +166,8 @@ void LoadFont(char *buffer)
fonttpage = GetTPage(0,0,960,466);
LoadImage(&fontclutpos, (u_long *)(file + 0x100));
LoadImage(&dest, (u_long *)(file + 0x120));
LoadImage(&fontclutpos, (u_long *)file);
LoadImage(&dest, (u_long *)(file + 32));
DrawSync(0);
}
@ -237,7 +241,7 @@ int PrintString(char *string, int x, int y)
chr = *string++;
width = x;
while (chr != 0)
while (chr)
{
if (chr == 32)
{
@ -245,8 +249,8 @@ int PrintString(char *string, int x, int y)
}
else if (chr < 32 || chr > 138 || chr < 128)
{
if (AsciiTable[chr] == 0xff)
index = AsciiTable[63];
if (AsciiTable[chr] == -1)
index = AsciiTable[63]; // place a question mark
else
index = AsciiTable[chr];
@ -519,7 +523,7 @@ int PrintScaledString(int y, char *string, int scale)
char c;
POLY_FT4 *font;
int height;
unsigned char vOff;
u_char vOff;
font = (POLY_FT4 *)current->primptr;
@ -613,7 +617,7 @@ char * GetNextWord(char *string, char *word)
}
// [D] [T]
void* DrawButton(unsigned char button, void *prim, int x, int y)
void* DrawButton(u_char button, void *prim, int x, int y)
{
TEXTURE_DETAILS *btn;
SPRT* sprt;

4
src_rebuild/Game/C/pres.h
View File

@ -7,7 +7,7 @@ extern void InitButtonTextures(); // 0x00074E54
extern void LoadFont(char *buffer); // 0x00073CC8
extern void SetTextColour(unsigned char Red, unsigned char Green, unsigned char Blue); // 0x00074A10
extern void SetTextColour(u_char Red, u_char Green, u_char Blue); // 0x00074A10
extern int StringWidth(char *pString); // 0x00074A24
extern int OutputString(char *pString, int formatting, int x, int y, int xw, int r, int g, int b); // 0x00074AB0
@ -23,7 +23,7 @@ extern void SetCLUT16Flags(ushort clutID, ushort mask, char transparent);
extern int PrintScaledString(int y, char *string, int scale); // 0x000745DC
extern char* GetNextWord(char *string, char *word); // 0x00074D54
extern void* DrawButton(unsigned char button, void *prim, int x, int y); // 0x00074858
extern void* DrawButton(u_char button, void *prim, int x, int y); // 0x00074858
extern void* SetFontTPage(void *prim); // 0x00074D94