fix splash colors regression

This commit is contained in:
Eduardo Bart 2012-06-01 22:52:40 -03:00
parent 59a80ffaf9
commit 4c143f4a33
1 changed files with 5 additions and 5 deletions

View File

@ -68,11 +68,7 @@ void Item::draw(const Point& dest, float scaleFactor, bool animate)
// determine x,y,z patterns
int xPattern = 0, yPattern = 0, zPattern = 0;
if(isGround() || isOnBottom()) {
xPattern = m_position.x % getNumPatternsX();
yPattern = m_position.y % getNumPatternsY();
zPattern = m_position.z % getNumPatternsZ();
} else if(isStackable() && getNumPatternsX() == 4 && getNumPatternsY() == 2) {
if(isStackable() && getNumPatternsX() == 4 && getNumPatternsY() == 2) {
if(m_countOrSubType <= 0) {
xPattern = 0;
yPattern = 0;
@ -164,6 +160,10 @@ void Item::draw(const Point& dest, float scaleFactor, bool animate)
xPattern = (color % 4) % getNumPatternsX();
yPattern = (color / 4) % getNumPatternsY();
} else if(isGround() || isOnBottom()) {
xPattern = m_position.x % getNumPatternsX();
yPattern = m_position.y % getNumPatternsY();
zPattern = m_position.z % getNumPatternsZ();
}
// setup item drawing shader