(svn r1330) Increase size of some vars from int16 to int32 to guard against future overflows

1 files changed, 8 insertions, 5 deletions

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);
 		}