zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix user quotes colored with a 2-digit number being wrongly x-aligned.

Browse source 
Such game text was shown starting from about the center of the screen.
The reason for the bug was this code:
  t += 1 + isdigit(*(t+2));
The sequence points here are at the beginning and end of this assignment
expression, and the updating of t may happen anywhere between these (C99
6.5.16 #3).  Please don't write such code.  When in doubt, and assignment
and reference to the same object should be split!

git-svn-id: https://svn.eduke32.com/eduke32@2380 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-02-24 19:51:37 +00:00
parent 0919c186ba
commit 668774c12e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
polymer/eduke32/source/game.c
View file

@ -328,7 +328,7 @@ int32_t G_PrintGameText(int32_t f, int32_t tile, int32_t x, int32_t y, const
{ {
int32_t ac; int32_t ac;
char centre; char centre;
int32_t squishtext = ((f&2) != 0); const int32_t squishtext = ((f&2) != 0);
int32_t shift = 16, widthx = 320; int32_t shift = 16, widthx = 320;
int32_t ox, oy, origx = x, origy = y; int32_t ox, oy, origx = x, origy = y;
@ -341,7 +341,8 @@ int32_t G_PrintGameText(int32_t f, int32_t tile, int32_t x, int32_t y, const
shift = 0; shift = 0;
} }
if ((centre = (x == (widthx>>1)))) centre = (x == (widthx>>1));
if (centre)
{ {
const char *oldt = t; const char *oldt = t;
int32_t newx = 0; int32_t newx = 0;
@ -358,7 +359,10 @@ int32_t G_PrintGameText(int32_t f, int32_t tile, int32_t x, int32_t y, const
if (*t == '^' && isdigit(*(t+1))) if (*t == '^' && isdigit(*(t+1)))
{ {
t += 1 + isdigit(*(t+2)); t++;
if (isdigit(*(t+1)))
t++;
// t += 1 + isdigit(*(t+2)); // This code is wrong, see C99 6.5.16 #3
continue; continue;
} }
@ -366,7 +370,8 @@ int32_t G_PrintGameText(int32_t f, int32_t tile, int32_t x, int32_t y, const
if (ac < tile || ac > (tile + 93)) break; if (ac < tile || ac > (tile + 93)) break;
newx += i = ((((f & 8) ? 8 : tilesizx[ac]) - squishtext) * z)>>16; i = ((((f & 8) ? 8 : tilesizx[ac]) - squishtext) * z)>>16;
newx += i;
if (*t >= '0' && *t <= '9') if (*t >= '0' && *t <= '9')
newx -= i - ((8 * z)>>16); newx -= i - ((8 * z)>>16);