miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openttd updated to 1.5.0-beta2

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_spritegroup.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: newgrf_spritegroup.cpp 26388 2014-03-03 20:02:31Z frosch $ */
/* $Id: newgrf_spritegroup.cpp 26482 2014-04-23 20:13:33Z rubidium $ */
/*
* This file is part of OpenTTD.
@@ -14,6 +14,8 @@
#include "newgrf_spritegroup.h"
#include "core/pool_func.hpp"
#include "safeguards.h"
SpriteGroupPool _spritegroup_pool("SpriteGroup");
INSTANTIATE_POOL_METHODS(SpriteGroup)
@@ -228,9 +230,9 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust *adjust, ScopeResolver
case DSGA_OP_ROR: return RotateRight(last_value, value);
case DSGA_OP_SCMP: return ((S)last_value == (S)value) ? 1 : ((S)last_value < (S)value ? 0 : 2);
case DSGA_OP_UCMP: return ((U)last_value == (U)value) ? 1 : ((U)last_value < (U)value ? 0 : 2);
case DSGA_OP_SHL: return (U)last_value << ((U)value & 0x1F); // mask 'value' to 5 bits, which should behave the same on all architectures.
case DSGA_OP_SHR: return (U)last_value >> ((U)value & 0x1F);
case DSGA_OP_SAR: return (S)last_value >> ((U)value & 0x1F);
case DSGA_OP_SHL: return (uint32)(U)last_value << ((U)value & 0x1F); // Same behaviour as in ParamSet, mask 'value' to 5 bits, which should behave the same on all architectures.
case DSGA_OP_SHR: return (uint32)(U)last_value >> ((U)value & 0x1F);
case DSGA_OP_SAR: return (int32)(S)last_value >> ((U)value & 0x1F);
default: return value;
}
}