diff --git a/projects/mtg/src/GuiStatic.cpp b/projects/mtg/src/GuiStatic.cpp index a087d2186..28e00ec2d 100644 --- a/projects/mtg/src/GuiStatic.cpp +++ b/projects/mtg/src/GuiStatic.cpp @@ -60,8 +60,8 @@ void GuiAvatar::Render() { if (corner == BOTTOM_RIGHT) { - x0 -= player->getIcon()->mWidth * actZ; - y0 -= player->getIcon()->mHeight * actZ; + x0 -= Width * actZ; + y0 -= Height * actZ; } switch (corner) { @@ -69,14 +69,14 @@ void GuiAvatar::Render() player->getIcon()->SetHotSpot(0, 0); break; case BOTTOM_RIGHT: - player->getIcon()->SetHotSpot(35, 50); + player->getIcon()->SetHotSpot(player->getIcon()->mWidth, player->getIcon()->mHeight); break; } player->getIcon()->SetColor(ARGB((int)actA, 255, avatarRed, avatarRed)); - r->RenderQuad(player->getIcon().get(), actX, actY, actT, actZ, actZ); + r->RenderQuad(player->getIcon().get(), actX, actY, actT, Width/player->getIcon()->mWidth*actZ, Height/player->getIcon()->mHeight*actZ); if (mHasFocus) { - r->FillRect(x0, x0, player->getIcon()->mWidth * actZ, player->getIcon()->mHeight * actZ, ARGB(abs(128 - wave),255,255,255)); + r->FillRect(x0, x0, Width/player->getIcon()->mWidth * actZ, Height/player->getIcon()->mHeight * actZ, ARGB(abs(128 - wave),255,255,255)); } } diff --git a/projects/mtg/src/Player.cpp b/projects/mtg/src/Player.cpp index 445375166..1efcc0b89 100644 --- a/projects/mtg/src/Player.cpp +++ b/projects/mtg/src/Player.cpp @@ -89,7 +89,7 @@ bool Player::loadAvatar(string file, string resName) } mAvatarTex = rm->RetrieveTexture(file, RETRIEVE_LOCK, TEXTURE_SUB_AVATAR); if (mAvatarTex) { - mAvatar = rm->RetrieveQuad(file, 0, 0, 35, 50, resName, RETRIEVE_NORMAL, TEXTURE_SUB_AVATAR); + mAvatar = rm->RetrieveQuad(file, 0, 0, 0, 0, resName, RETRIEVE_NORMAL, TEXTURE_SUB_AVATAR); return true; }