gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refix last commit

This commit is contained in:
Henrique Santiago 2013-02-07 03:37:57 -02:00
parent 3c3ba9ef4c
commit 4f3be92208
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/thing.h
View File

@ -59,8 +59,6 @@ public:
virtual bool isAnimatedText() { return false; } virtual bool isAnimatedText() { return false; }
virtual bool isStaticText() { return false; } virtual bool isStaticText() { return false; }
virtual bool isValid() { return rawGetThingType() != nullptr; }
// type shortcuts // type shortcuts
virtual const ThingTypePtr& getThingType(); virtual const ThingTypePtr& getThingType();
virtual ThingType *rawGetThingType(); virtual ThingType *rawGetThingType();

3
src/client/thingtype.cpp
View File

@ -336,6 +336,9 @@ uint ThingType::getTextureIndex(int l, int x, int y, int z) {
int ThingType::getExactSize(int layer, int xPattern, int yPattern, int zPattern, int animationPhase) int ThingType::getExactSize(int layer, int xPattern, int yPattern, int zPattern, int animationPhase)
{ {
if(m_null)
return 0;
getTexture(animationPhase); // we must calculate it anyway. getTexture(animationPhase); // we must calculate it anyway.
int frameIndex = getTextureIndex(layer, xPattern, yPattern, zPattern); int frameIndex = getTextureIndex(layer, xPattern, yPattern, zPattern);
Size size = m_texturesFramesOriginRects[animationPhase][frameIndex].size() - m_texturesFramesOffsets[animationPhase][frameIndex].toSize(); Size size = m_texturesFramesOriginRects[animationPhase][frameIndex].size() - m_texturesFramesOffsets[animationPhase][frameIndex].toSize();

2
src/client/uiitem.cpp
View File

@ -44,7 +44,7 @@ void UIItem::drawSelf(Fw::DrawPane drawPane)
drawImage(m_rect); drawImage(m_rect);
if(m_itemVisible && m_item && m_item->isValid()) { if(m_itemVisible && m_item) {
Rect drawRect = getPaddingRect(); Rect drawRect = getPaddingRect();
Point dest = drawRect.bottomRight() + Point(1,1); Point dest = drawRect.bottomRight() + Point(1,1);