mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-01-22 15:11:54 +00:00
(svn r11390) -Fix r11387: AB() was wrong (spotted by Rafal Rzepecki, patch by skidd13)
This commit is contained in:
parent
cd5597dddf
commit
4bcca42762
@ -66,9 +66,8 @@ template<typename T, typename U> static inline T SB(T& x, const uint8 s, const u
|
||||
*/
|
||||
template<typename T, typename U> static inline T AB(T& x, const uint8 s, const uint8 n, const U i)
|
||||
{
|
||||
const T tmp = (T)(((1U << n) - 1) << s);
|
||||
x &= ~tmp;
|
||||
x |= (T)((x + (i << s)) & tmp);
|
||||
const T mask = (T)(((1U << n) - 1) << s);
|
||||
x = (T)((x & ~mask) | ((x + (i << s)) & mask));
|
||||
return x;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user