Merge branch 'master' of github.com:edubart/otclient

This commit is contained in:
Eduardo Bart 2011-08-22 09:44:36 -03:00
commit 10ea2e5de1
2 changed files with 4 additions and 4 deletions

View File

@ -66,7 +66,7 @@ void Creature::drawInformation(int x, int y, bool useGray)
} }
} }
Rect backgroundRect = Rect(x-(14.5), y-2, 27, 4); Rect backgroundRect = Rect(x-(14.5), y, 27, 4);
Rect healthRect = backgroundRect.expanded(-1); Rect healthRect = backgroundRect.expanded(-1);
healthRect.setWidth((m_healthPercent/100.0)*25); healthRect.setWidth((m_healthPercent/100.0)*25);
@ -81,7 +81,7 @@ void Creature::drawInformation(int x, int y, bool useGray)
// name // name
FontPtr font = g_fonts.getFont("tibia-12px-rounded"); FontPtr font = g_fonts.getFont("tibia-12px-rounded");
font->renderText(m_name, Rect(x-100, y-16, 200, 16), AlignTopCenter, fillColor); font->renderText(m_name, Rect(x-100, y-15, 200, 15), AlignTopCenter, fillColor);
} }
const ThingAttributes& Creature::getAttributes() const ThingAttributes& Creature::getAttributes()

View File

@ -86,8 +86,8 @@ void Map::draw(const Rect& rect)
const ThingPtr& thing = *it; const ThingPtr& thing = *it;
const CreaturePtr& creature = thing->asCreature(); const CreaturePtr& creature = thing->asCreature();
int x = (ix + 7)*32 + 5 - tile->getDrawNextOffset(); int x = (ix + 7)*32 + 10 - tile->getDrawNextOffset();
int y = (iy + 5)*32 - 8 - tile->getDrawNextOffset(); int y = (iy + 5)*32 - 10 - tile->getDrawNextOffset();
// TODO: create isCovered function. // TODO: create isCovered function.
bool useGray = (drawFloorStop != playerPos.z-1); bool useGray = (drawFloorStop != playerPos.z-1);