walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A bit more

This commit is contained in:
Julie Marchant 2019-06-02 19:53:03 -04:00
parent 1af6cfd75b
commit 1b8581f471
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gfx.c
View File

@ -241,6 +241,7 @@ int gfx_renderUnicodeBase(const char *in, int x, int y, int fontColor, int wrap,
int errorcode; int errorcode;
int i, j; int i, j;
int done_rendering; int done_rendering;
SDL_Rect area;
int nextline_y = y; int nextline_y = y;
color.r = fontColor & 0xff0000; color.r = fontColor & 0xff0000;
@ -265,7 +266,7 @@ int gfx_renderUnicodeBase(const char *in, int x, int y, int fontColor, int wrap,
i += utf8proc_iterate(&remainingStr[i], -1, &buf); i += utf8proc_iterate(&remainingStr[i], -1, &buf);
if (buf < 0) if (buf < 0)
{ {
printf("WARNING: Unicode string \"%s\" contains invalid characters!", in); printf("WARNING: Unicode string \"%s\" contains invalid characters!\n", in);
break; break;
} }
else else
@ -309,6 +310,7 @@ int gfx_renderUnicodeBase(const char *in, int x, int y, int fontColor, int wrap,
{ {
currentLine = ""; currentLine = "";
nCurrentLine = 0; nCurrentLine = 0;
remainingStr = "";
done_rendering = 0; done_rendering = 0;
for (j = 0; j < nCharList - 1; j++) for (j = 0; j < nCharList - 1; j++)
{ {
@ -317,7 +319,10 @@ int gfx_renderUnicodeBase(const char *in, int x, int y, int fontColor, int wrap,
utf8proc_encode_char(charList[j], &remainingStr[j - nCurrentLine]); utf8proc_encode_char(charList[j], &remainingStr[j - nCurrentLine]);
} }
else else
{
utf8proc_encode_char(charList[j], &currentLine[j]); utf8proc_encode_char(charList[j], &currentLine[j]);
nCurrentLine++;
}
if (j == breakPoints[i]) if (j == breakPoints[i])
{ {
@ -325,7 +330,16 @@ int gfx_renderUnicodeBase(const char *in, int x, int y, int fontColor, int wrap,
} }
} }
textSurf = TTF_RenderUTF8_Solid(gfx_unicodeFont, currentLine, color); textSurf = TTF_RenderUTF8_Solid(gfx_unicodeFont, currentLine, color);
# TODO area.x = x;
area.y = y;
area.w = textSurf->w
area.h = textSurf->h
if (SDL_BlitSurface(textSurf, NULL, dest, &area) < 0)
{
printf("BlitSurface error: %s\n", SDL_GetError());
engine_showError(2, "");
}
y += TTF_FontHeight(gfx_unicodeFont);
break; break;
} }
} }
@ -336,6 +350,8 @@ int gfx_renderUnicodeBase(const char *in, int x, int y, int fontColor, int wrap,
} }
} }
} }
return y;
} }
int gfx_renderUnicode(const char *in, int x, int y, int fontColor, int wrap, SDL_Surface *dest) int gfx_renderUnicode(const char *in, int x, int y, int fontColor, int wrap, SDL_Surface *dest)