# HG changeset patch # User pasky # Date 1112185670 0 # Node ID d15a9fdea49e94d257e9897f8eb44f0e61a71ee4 # Parent 279dd2265cae71c148d415629f1a2992180cae87 (svn r2110) - Fix: Fixed test for various flags (e.g. newtrains in usset). result is bool so !! any non-zero values before assigning them to it - they apparently didn't fit. ;-) diff -r 279dd2265cae -r d15a9fdea49e newgrf.c --- a/newgrf.c Wed Mar 30 09:25:20 2005 +0000 +++ b/newgrf.c Wed Mar 30 12:27:50 2005 +0000 @@ -1667,8 +1667,9 @@ return; } + DEBUG(grf, 7) ("Test condtype %d, param %x, condval %x", condtype, param_val, cond_val); switch (condtype) { - case 0: result = (param_val & (1 << cond_val)); + case 0: result = !!(param_val & (1 << cond_val)); break; case 1: result = !(param_val & (1 << cond_val)); break; @@ -1681,7 +1682,7 @@ break; case 5: result = (param_val > cond_val); break; - case 6: result = param_val; /* GRFID is active (only for param-num=88) */ + case 6: result = !!param_val; /* GRFID is active (only for param-num=88) */ break; case 7: result = !param_val; /* GRFID is not active (only for param-num=88) */ break;