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

Fixed bug for translated deck descriptions in DeckManager.

Browse Source
This commit is contained in:
linshier
2010-09-13 10:59:59 +00:00
parent 9d3707386b
commit 16fe2d8a4f
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
projects/mtg/src/GameState.cpp
View File

@@ -87,16 +87,8 @@ int GameState::fillDeckMenu(vector<int> * deckIdList, SimpleMenu * _menu, string
sprintf(deckDesc, "%s",meta->name.c_str());
}
deckDesc[16] = 0;
//translate decks desc
Translator * t = Translator::GetInstance();
map<string,string>::iterator it = t->deckValues.find(meta->name);
if (it != t->deckValues.end())
_menu->Add(nbDecks,deckDesc, it->second);
else
{
menu[deckDesc] = *meta;
deckNameVector.push_back( deckDesc );
}
menu[deckDesc] = *meta;
deckNameVector.push_back( deckDesc );
}
}
@@ -104,12 +96,19 @@ int GameState::fillDeckMenu(vector<int> * deckIdList, SimpleMenu * _menu, string
int deckNumber = 1;
deckIdList->clear();
Translator * t = Translator::GetInstance();
map<string,string>::iterator it;
for (list<string>::iterator i = deckNameVector.begin(); i != deckNameVector.end(); i++)
{
string deckName = *i;
DeckMetaData meta = menu[ deckName ];
string deckDescription = meta.desc;
deckIdList->push_back( meta.deckid );
//translate decks desc
it = t->deckValues.find(meta.name);
if (it != t->deckValues.end())
_menu->Add(deckNumber++, deckName.c_str(), it->second);
else
_menu->Add( deckNumber++ ,deckName.c_str(), deckDescription.c_str());
}
return nbDecks;