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

Some tweaks to the fonts in the game deck selection screen - the 'wagic' green cursive font was a bit of an eyesore, and wasn't consistent color-wise with the other main font used for the stats & description.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-11-07 14:21:21 +00:00
parent a90d2ed2e7
commit 2d31cbdaf5
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/DeckMenu.cpp
+7 -2
View File
@@ -72,7 +72,7 @@ fontId(fontId) {
// we want to cap the deck titles to 15 characters to avoid overflowing deck names // we want to cap the deck titles to 15 characters to avoid overflowing deck names
title = _(_title); title = _(_title);
titleFont = resources.GetWFont(Fonts::MAGIC_FONT); titleFont = resources.GetWFont(Fonts::OPTION_FONT);
startId = 0; startId = 0;
selectionT = 0; selectionT = 0;
timeOpen = 0; timeOpen = 0;
@@ -146,7 +146,7 @@ void DeckMenu::Render()
string text = currentMenuItem->desc; string text = currentMenuItem->desc;
WFont *mainFont = resources.GetWFont(Fonts::MAIN_FONT); WFont *mainFont = resources.GetWFont(Fonts::MAIN_FONT);
mainFont->DrawString(text.c_str(), descX, descY); mainFont->DrawString(text.c_str(), descX, descY);
mFont->SetColor(ARGB(255,255,255,0)); mFont->SetColor(ARGB(255,255,255,255));
// fill in the statistical portion // fill in the statistical portion
if ( currentMenuItem->meta ) if ( currentMenuItem->meta )
@@ -168,7 +168,12 @@ void DeckMenu::Render()
renderer->RenderQuad( background, 0, 0 ); renderer->RenderQuad( background, 0, 0 );
if (!title.empty()) if (!title.empty())
{
titleFont->SetColor(ARGB(100,255,255,255));
titleFont->SetScale(.8f);
titleFont->DrawString(title.c_str(), titleX, titleY, JGETEXT_CENTER); titleFont->DrawString(title.c_str(), titleX, titleY, JGETEXT_CENTER);
titleFont->SetScale(1.0f);
}
scroller->Render(); scroller->Render();
} }
projects/mtg/src/GameStateDuel.cpp
+2 -2
View File
@@ -94,7 +94,7 @@ void GameStateDuel::Start()
if (mParent->players[i] == PLAYER_TYPE_HUMAN){ if (mParent->players[i] == PLAYER_TYPE_HUMAN){
decksneeded = 1; decksneeded = 1;
deckmenu = NEW DeckMenu(DUEL_MENU_CHOOSE_DECK, this, Fonts::MAGIC_FONT, "Choose a Deck"); deckmenu = NEW DeckMenu(DUEL_MENU_CHOOSE_DECK, this, Fonts::OPTION_FONT, "Choose a Deck");
DeckManager *deckManager = DeckManager::GetInstance(); DeckManager *deckManager = DeckManager::GetInstance();
vector<DeckMetaData *> playerDeckList = getValidDeckMetaData( options.profileFile() ); vector<DeckMetaData *> playerDeckList = getValidDeckMetaData( options.profileFile() );
@@ -238,7 +238,7 @@ bool GameStateDuel::MusicExist(string FileName){
void GameStateDuel::ensureOpponentMenu(){ void GameStateDuel::ensureOpponentMenu(){
if (!opponentMenu){ if (!opponentMenu){
opponentMenu = NEW DeckMenu(DUEL_MENU_CHOOSE_OPPONENT, this, Fonts::MAGIC_FONT, "Choose Your Opponent"); opponentMenu = NEW DeckMenu(DUEL_MENU_CHOOSE_OPPONENT, this, Fonts::OPTION_FONT, "Choose Your Opponent");
opponentMenu->Add( MENUITEM_RANDOM_AI, "Random"); opponentMenu->Add( MENUITEM_RANDOM_AI, "Random");
if (options[Options::EVILTWIN_MODE_UNLOCKED].number) if (options[Options::EVILTWIN_MODE_UNLOCKED].number)
opponentMenu->Add( MENUITEM_EVIL_TWIN, "Evil Twin", _("Can you play against yourself?").c_str()); opponentMenu->Add( MENUITEM_EVIL_TWIN, "Evil Twin", _("Can you play against yourself?").c_str());