fix splash colors regression
This commit is contained in:
parent
59a80ffaf9
commit
4c143f4a33
|
@ -68,11 +68,7 @@ void Item::draw(const Point& dest, float scaleFactor, bool animate)
|
||||||
|
|
||||||
// determine x,y,z patterns
|
// determine x,y,z patterns
|
||||||
int xPattern = 0, yPattern = 0, zPattern = 0;
|
int xPattern = 0, yPattern = 0, zPattern = 0;
|
||||||
if(isGround() || isOnBottom()) {
|
if(isStackable() && getNumPatternsX() == 4 && getNumPatternsY() == 2) {
|
||||||
xPattern = m_position.x % getNumPatternsX();
|
|
||||||
yPattern = m_position.y % getNumPatternsY();
|
|
||||||
zPattern = m_position.z % getNumPatternsZ();
|
|
||||||
} else if(isStackable() && getNumPatternsX() == 4 && getNumPatternsY() == 2) {
|
|
||||||
if(m_countOrSubType <= 0) {
|
if(m_countOrSubType <= 0) {
|
||||||
xPattern = 0;
|
xPattern = 0;
|
||||||
yPattern = 0;
|
yPattern = 0;
|
||||||
|
@ -164,6 +160,10 @@ void Item::draw(const Point& dest, float scaleFactor, bool animate)
|
||||||
|
|
||||||
xPattern = (color % 4) % getNumPatternsX();
|
xPattern = (color % 4) % getNumPatternsX();
|
||||||
yPattern = (color / 4) % getNumPatternsY();
|
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
|
// setup item drawing shader
|
||||||
|
|
Loading…
Reference in New Issue