diff options
author | tron <tron@openttd.org> | 2005-01-03 08:50:44 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-01-03 08:50:44 +0000 |
commit | 29e71638ce1dfa3d86a3b0ddf5b109e4fb0320a9 (patch) | |
tree | 5c567cb4d90a99802939c3df5715fe67cc68f45b /texteff.c | |
parent | 608cdbe3f67b9b05ace108cdf1ab4ffc808c792a (diff) | |
download | openttd-29e71638ce1dfa3d86a3b0ddf5b109e4fb0320a9.tar.xz |
(svn r1330) Increase size of some vars from int16 to int32 to guard against future overflows
Diffstat (limited to 'texteff.c')
-rw-r--r-- | texteff.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -9,7 +9,10 @@ typedef struct TextEffect { StringID string_id; - int16 x,y,right,bottom; + int32 x; + int32 y; + int32 right; + int32 bottom; uint16 duration; uint32 params_1; uint32 params_2; @@ -276,10 +279,10 @@ void DrawTextEffects(DrawPixelInfo *dpi) continue; /* intersection? */ - if ((int16)dpi->left > te->right || - (int16)dpi->top > te->bottom || - (int16)(dpi->left + dpi->width) <= te->x || - (int16)(dpi->top + dpi->height) <= te->y) + if (dpi->left > te->right || + dpi->top > te->bottom || + dpi->left + dpi->width <= te->x || + dpi->top + dpi->height <= te->y) continue; AddStringToDraw(te->x, te->y, te->string_id, te->params_1, te->params_2, 0); } |