diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index d1c0adef2..6a9f7fa5a 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -276,6 +276,8 @@ void DeckMenu::Render() JQuadPtr quad = WResourceManager::Instance()->RetrieveTempQuad(currentAvatarImageName, TEXTURE_SUB_AVATAR); if(quad.get()) { + quad->mWidth = 35.f; + quad->mHeight = 50.f; if (currentMenuItem->getText() == "Evil Twin") { JQuad * evil = quad.get(); diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index 5648b778b..7dc82def3 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/projects/mtg/src/GameApp.cpp @@ -173,6 +173,7 @@ void GameApp::Create() LOG("Loading Textures"); LOG("--Loading menuicons.png"); WResourceManager::Instance()->RetrieveTexture("menuicons.png", RETRIEVE_MANAGE); + WResourceManager::Instance()->RetrieveTexture("miconslarge.png", RETRIEVE_MANAGE); LOG("---Gettings menuicons.png quads"); //Load all icons from gModRules and save in manaIcons -> todo. Change the icons positions on menuicons.png to avoid use item->mColorId diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 1306f5f8b..d10fcaa2d 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -85,10 +85,14 @@ void GameStateMenu::Create() { for (int j = 0; j < 2; j++) { - sprintf(buf, "menuicons%d%d", i, j); - mIcons[n] = WResourceManager::Instance()->RetrieveQuad("menuicons.png", 2 + i * 36.0f, 2.0f + j * 36.0f, 32.0f, 32.0f, buf); + sprintf(buf, "miconslarge%d%d", i, j); + mIcons[n] = WResourceManager::Instance()->RetrieveQuad("miconslarge.png", 4 + i * 72.0f, 4.0f + j * 72.0f, 72.0f, 72.0f, buf); if (mIcons[n]) + { + mIcons[n]->mHeight = 36.f; + mIcons[n]->mWidth = 36.f; mIcons[n]->SetHotSpot(16, 16); + } n++; } } diff --git a/projects/mtg/src/GuiBackground.cpp b/projects/mtg/src/GuiBackground.cpp index dfcbfe232..20bd3fdfa 100644 --- a/projects/mtg/src/GuiBackground.cpp +++ b/projects/mtg/src/GuiBackground.cpp @@ -30,6 +30,8 @@ void GuiBackground::Render() } if (quad.get()) { + quad->mWidth = 480.f; + quad->mHeight = 255.f; renderer->RenderQuad(quad.get(), 0, 18); } } diff --git a/projects/mtg/src/GuiFrame.cpp b/projects/mtg/src/GuiFrame.cpp index e4f764fe9..276fefffa 100644 --- a/projects/mtg/src/GuiFrame.cpp +++ b/projects/mtg/src/GuiFrame.cpp @@ -9,7 +9,11 @@ GuiFrame::GuiFrame(GameObserver* observer) if (observer->getResourceManager()) { if (observer->getResourceManager()->GetTexture("wood.png")) - wood = observer->getResourceManager()->RetrieveQuad("wood.png", 0, 0, SCREEN_WIDTH, 28); + { + wood = observer->getResourceManager()->RetrieveQuad("wood.png", 0, 0, 0, 0); + wood->mHeight =32.f; + wood->mWidth = 480.f; + } else { GameApp::systemError += "Can't load wood texture : " __FILE__ "\n";