mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r4616) - NewGRF: when evaluating a variable adjustment, give our value the correct type after rather than before it has been adjusted.

This commit is contained in:
peter1138 2006-04-29 07:26:57 +00:00
parent 7ab8b20faf
commit 19e3eb6f3c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newgrf_spritegroup.c
View File

@ -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; \