From 49a825fc43f8b20dc930a6695dc666c6420a50d2 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sat, 29 Apr 2006 07:26:57 +0000 Subject: [PATCH] (svn r4616) - NewGRF: when evaluating a variable adjustment, give our value the correct type after rather than before it has been adjusted. --- newgrf_spritegroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/newgrf_spritegroup.c b/newgrf_spritegroup.c index cac7bbb203..d389c07ad9 100644 --- a/newgrf_spritegroup.c +++ b/newgrf_spritegroup.c @@ -112,7 +112,7 @@ static inline uint32 GetVariable(const ResolverObject *object, byte variable, by /* Evaluate an adjustment for a variable of the given size. This is a bit of * an unwieldy macro, but it saves triplicating the code. */ #define BUILD_EVAL_ADJUST(size, usize) \ -static inline size EvalAdjust_ ## size(const DeterministicSpriteGroupAdjust *adjust, size last_value, size value) \ +static inline size EvalAdjust_ ## size(const DeterministicSpriteGroupAdjust *adjust, size last_value, uint value) \ { \ value >>= adjust->shift_num; \ value &= adjust->and_mask; \ @@ -124,6 +124,9 @@ static inline size EvalAdjust_ ## size(const DeterministicSpriteGroupAdjust *adj case DSGA_TYPE_MOD: value %= (size)adjust->divmod_val; break; \ case DSGA_TYPE_NONE: break; \ } \ +\ + /* Get our value to the correct range */ \ + value = (size)value; \ \ switch (adjust->operation) { \ case DSGA_OP_ADD: return last_value + value; \