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

Fixed traslation code of deck descriptions for new deckmenu.

Browse Source
This commit is contained in:
linshier
2010-11-09 11:19:06 +00:00
parent 164f2c5205
commit c71f8f4a46
4 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/DeckMenu.cpp
+7 -2
View File
@@ -213,7 +213,12 @@ void DeckMenu::Update(float dt){
void DeckMenu::Add(int id, const char * text,string desc, bool forceFocus, DeckMetaData * deckMetaData) {
DeckMenuItem * menuItem = NEW DeckMenuItem(this, id, fontId, text, 0, mY + kVerticalMargin + mCount*kLineHeight, (mCount == 0), autoTranslate, deckMetaData);
menuItem->desc = deckMetaData ? deckMetaData->getDescription() : desc;
Translator * t = Translator::GetInstance();
map<string,string>::iterator it = t->deckValues.find(text);
if (it != t->deckValues.end()) //translate decks desc
menuItem->desc = it->second;
else
menuItem->desc = deckMetaData ? deckMetaData->getDescription() : desc;
JGuiController::Add(menuItem);
if (mCount <= maxItems)
@@ -253,4 +258,4 @@ void DeckMenu::destroy(){
DeckMenu::~DeckMenu()
{
SAFE_DELETE(scroller);
}
}
projects/mtg/src/GameState.cpp
+3 -17
View File
@@ -79,19 +79,12 @@ vector<DeckMetaData *> GameState::getValidDeckMetaData( const string& path, cons
void GameState::renderDeckMenu ( SimpleMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList )
{
int deckNumber = 1;
Translator * t = Translator::GetInstance();
map<string,string>::iterator it;
for (vector<DeckMetaData *>::const_iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
{
DeckMetaData * deckMetaData = *i;
string deckName = deckMetaData -> getName();
string deckDescription = deckMetaData -> getDescription();
//translate decks desc
it = t->deckValues.find(deckName);
if (it != t->deckValues.end())
_menu->Add(deckNumber++, deckName.c_str(), it->second);
else
_menu->Add( deckNumber++ ,deckName.c_str(), deckDescription.c_str());
_menu->Add( deckNumber++ ,deckName.c_str(), deckDescription.c_str());
}
}
@@ -100,20 +93,13 @@ void GameState::renderDeckMenu ( SimpleMenu * _menu, const vector<DeckMetaData *
void GameState::renderDeckMenu ( DeckMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList )
{
int deckNumber = 1;
Translator * t = Translator::GetInstance();
map<string,string>::iterator it;
for (vector<DeckMetaData *>::const_iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
{
DeckMetaData * deckMetaData = *i;
string deckName = deckMetaData -> getName();
string deckDescription = deckMetaData -> getDescription();
int deckId = deckMetaData -> getDeckId();
//translate decks desc
it = t->deckValues.find(deckName);
if (it != t->deckValues.end())
_menu->Add(deckNumber++, deckName.c_str(), it->second, false, deckMetaData);
else
_menu->Add( deckNumber++ ,deckName.c_str(), deckDescription.c_str(), false, deckMetaData);
//int deckId = deckMetaData -> getDeckId(); //do we need this?
_menu->Add( deckNumber++ ,deckName.c_str(), deckDescription.c_str(), false, deckMetaData);
}
}