From c11e55a8b3b83700729df7e622ad3d4f33e26703 Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Mon, 6 Feb 2012 01:40:22 +0000 Subject: [PATCH] kGameIconPadsize was already defined in ActionStack.cpp. Renamed constant to avoid clash with definition in ActionStack.cpp --- projects/mtg/src/GameStateShop.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 3a18ddd7f..01748ee8c 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -28,7 +28,7 @@ float GameStateShop::_y4[] = { 169, 188, 250, 182, 182, 168, 220, 208, 198, 259, namespace { - float kGamepadIconSize = 0.5f; + float kPspIconScaleFactor = 0.5f; std::string kOtherCardsString(": Other cards"); std::string kCreditsString("Credits: "); } @@ -771,7 +771,7 @@ void GameStateShop::Render() #ifndef TOUCH_ENABLED float len = 4 + mFont->GetStringWidth(kOtherCardsString.c_str()); - r->RenderQuad(pspIcons[6].get(), SCREEN_WIDTH - len - kGamepadIconSize - 10, SCREEN_HEIGHT - 8, 0, kGamepadIconSize, kGamepadIconSize); + r->RenderQuad(pspIcons[6].get(), SCREEN_WIDTH - len - 0.5 - 10, SCREEN_HEIGHT - 8, 0, kPspIconScaleFactor, kPspIconScaleFactor); mFont->DrawString(kOtherCardsString, SCREEN_WIDTH - len, SCREEN_HEIGHT - 14); #else enableButtons();