Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kGameIconPadsize was already defined in ActionStack.cpp. Renamed constant to avoid clash with definition in ActionStack.cpp

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-02-06 01:40:22 +00:00
parent 4bd74db547
commit c11e55a8b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateShop.cpp
+2 -2
View File
@@ -28,7 +28,7 @@ float GameStateShop::_y4[] = { 169, 188, 250, 182, 182, 168, 220, 208, 198, 259,
namespace namespace
{ {
float kGamepadIconSize = 0.5f; float kPspIconScaleFactor = 0.5f;
std::string kOtherCardsString(": Other cards"); std::string kOtherCardsString(": Other cards");
std::string kCreditsString("Credits: "); std::string kCreditsString("Credits: ");
} }
@@ -771,7 +771,7 @@ void GameStateShop::Render()
#ifndef TOUCH_ENABLED #ifndef TOUCH_ENABLED
float len = 4 + mFont->GetStringWidth(kOtherCardsString.c_str()); 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); mFont->DrawString(kOtherCardsString, SCREEN_WIDTH - len, SCREEN_HEIGHT - 14);
#else #else
enableButtons(); enableButtons();