From 4c143f4a335fec887a0833133b1a59f0c2c4e78a Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Fri, 1 Jun 2012 22:52:40 -0300 Subject: [PATCH] fix splash colors regression --- src/otclient/core/item.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/otclient/core/item.cpp b/src/otclient/core/item.cpp index bd24f3cd..bcc7a45c 100644 --- a/src/otclient/core/item.cpp +++ b/src/otclient/core/item.cpp @@ -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