zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

engine.c: for printext16(), make newlines do what you expect them to.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4422 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-04-06 22:24:19 +00:00
parent 0aec0c53ed
commit b1e38e080d
1 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
polymer/eduke32/build/src/engine.c
View file

@ -16891,30 +16891,46 @@ void draw2dscreen(const vec3_t *pos, int16_t cursectnum, int16_t ange, int32_t z
enddrawing(); //}}} enddrawing(); //}}}
} }
static int32_t printext_checkypos(int32_t ypos, int32_t *yminptr, int32_t *ymaxptr)
{
int32_t ymin=0, ymax=7;
if (ypos < 0)
{
ymin = 0-ypos;
if (ymin > 7)
return 1;
}
else if (ypos+7 >= ydim)
{
ymax = ydim-ypos-1;
if (ymax < 0)
return 1;
}
*yminptr = ymin;
*ymaxptr = ymax;
return 0;
}
// //
// printext16 // printext16
// //
int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize)
{ {
int32_t stx, i, x, y, charxsiz, ocol = col, obackcol = backcol; int32_t stx, i, x, y, charxsiz, ocol = col, obackcol = backcol;
int32_t ymin=0, ymax=7; int32_t ymin, ymax;
char *fontptr, *letptr, *ptr; char *fontptr, *letptr, *ptr;
char smallbuf[4]; char smallbuf[4];
const int32_t xpos0 = xpos;
stx = xpos; stx = xpos;
if (ypos<0) if (printext_checkypos(ypos, &ymin, &ymax))
{ return 0;
ymin = 0-ypos;
if (ymin>7)
return 0;
}
else if (ypos+7 >= ydim)
{
ymax = ydim-ypos-1;
if (ymax<0)
return 0;
}
if (fontsize & 2) printext16(xpos+1, ypos+1, 0, -1, name, (fontsize & ~2) | 4); if (fontsize & 2) printext16(xpos+1, ypos+1, 0, -1, name, (fontsize & ~2) | 4);
if (fontsize & 1) { fontptr = smalltextfont; charxsiz = 4; } if (fontsize & 1) { fontptr = smalltextfont; charxsiz = 4; }
@ -16990,6 +17006,15 @@ int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, con
} }
} }
if (name[i] == '\n')
{
xpos = stx = xpos0;
ypos += 8;
if (printext_checkypos(ypos, &ymin, &ymax))
return 0;
continue;
}
if (stx<0) if (stx<0)
{ {
stx += charxsiz; stx += charxsiz;