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

Refactor: PrintStringBoxed, GetNextWord

Browse Source
This commit is contained in:
Fireboyd78 2020-08-26 09:57:35 -07:00
parent 360a051190
commit de90826751
1 changed files with 48 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src_rebuild/GAME/C/PRES.C
View File

@ -802,76 +802,69 @@ int PrintStringFeature(char *string, int x, int y, int w, int h, int transparent
/* end block 4 */ /* end block 4 */
// End Line: 1388 // End Line: 1388
// [D] // [D] [A]
void PrintStringBoxed(char *string, int ix, int iy) void PrintStringBoxed(char *string, int ix, int iy)
{ {
char bVar1;
char *pbVar2;
unsigned char uVar3;
short sVar4;
int iVar6;
uint uVar7;
SPRT *font; SPRT *font;
int iVar9;
int iVar10;
char word[32]; char word[32];
char *wpt;
int x;
int y;
int index;
int wordcount;
font = (SPRT *)current->primptr; font = (SPRT *)current->primptr;
if (*string != 0) if (*string != 0)
{ {
iVar10 = 1; wordcount = 1;
iVar9 = ix;
do { x = ix;
string = GetNextWord(string, word); y = iy;
iVar6 = StringWidth(word);
if (0x134 < iVar9 + iVar6 && (iVar10 != 1 || (*string != 0))) do
{
string = GetNextWord(string, word);
if ((x + StringWidth(word)) > 308 && (wordcount != 1 || (*string != 0)))
{ {
iy = iy + 0xe; x = ix;
iVar9 = ix; y += 14;
} }
pbVar2 = word; wpt = word;
bVar1 = word[0];
while (pbVar2 = pbVar2 + 1, bVar1 != 0) char c = 0;
while ((c = *wpt++) != 0)
{ {
if (bVar1 == 32) if (c == ' ')
{ {
iVar9 = iVar9 + 4; x += 4;
} }
else else
{ {
uVar7 = AsciiTable[bVar1]; index = AsciiTable[c];
if (uVar7 != 0xffffffff) if (index != -1)
{ {
OUT_FONTINFO *pFontInfo = &fontinfo[index];
setSprt(font); setSprt(font);
font->r0 = gFontColour.r; setRGB0(font, gFontColour.r, gFontColour.g, gFontColour.b);
font->g0 = gFontColour.g; setXY0(font, x, y + pFontInfo->offy);
font->b0 = gFontColour.b; setUV0(font, pFontInfo->x, pFontInfo->y - 46);
setWH(font, pFontInfo->width, pFontInfo->height);
font->x0 = iVar9;
font->y0 = fontinfo[uVar7].offy + iy;
font->u0 = fontinfo[uVar7].x;
font->v0 = fontinfo[uVar7].y - 46;
font->w = fontinfo[uVar7].width;
font->clut = fontclutid;
font->h = fontinfo[uVar7].height;;
addPrim(current->ot, font); addPrim(current->ot, font);
font++; font++;
iVar9 = iVar9 + (uint)fontinfo[uVar7].width;
} }
} }
bVar1 = *pbVar2;
} }
iVar10++;
wordcount++;
} while (*string != 0); } while (*string != 0);
} }
@ -891,8 +884,9 @@ void PrintStringBoxed(char *string, int ix, int iy)
null->tpage = fonttpage; null->tpage = fonttpage;
addPrim(current->ot, null); addPrim(current->ot, null);
null++;
current->primptr = (char*)(null+1); current->primptr = (char *)null;
} }
@ -1097,29 +1091,22 @@ int PrintScaledString(int y, char *string, int scale)
// [D] // [D]
char * GetNextWord(char *string, char *word) char * GetNextWord(char *string, char *word)
{ {
char cVar1; char c = *string;
cVar1 = *string; while (c != 0)
do { {
if (cVar1 == '\0') string++;
{
LAB_00074d88:
*word = '\0';
return string;
}
string = string + 1; if ((*word++ = c) == ' ')
if (cVar1 == ' ') break;
{
*word = ' ';
word = word + 1;
goto LAB_00074d88;
}
*word = cVar1; c = *string;
cVar1 = *string; }
word = word + 1;
} while (true); // add null-terminator
*word = '\0';
return string;
} }