From 29e71638ce1dfa3d86a3b0ddf5b109e4fb0320a9 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 3 Jan 2005 08:50:44 +0000 Subject: (svn r1330) Increase size of some vars from int16 to int32 to guard against future overflows --- texteff.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'texteff.c') diff --git a/texteff.c b/texteff.c index 05c9fc189..e9510fc57 100644 --- a/texteff.c +++ b/texteff.c @@ -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); } -- cgit v1.2.3-54-g00ecf