diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index 72df17aec..d0080525b 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -353,7 +353,10 @@ void GameStateMenu::Update(float dt) subMenuController->Update(dt); break; case MENU_STATE_MAJOR_LOADING_CARDS : - if (primitivesLoadCounter == -1) listPrimitives(); + if (primitivesLoadCounter == -1){ + listPrimitives(); + Translator::GetInstance()->init(); + } if (primitivesLoadCounter < (int)(primitives.size())){ mParent->collection->load(primitives[primitivesLoadCounter].c_str() ); primitivesLoadCounter++; @@ -364,7 +367,6 @@ void GameStateMenu::Update(float dt) mParent->collection->load(mCurrentSetFileName, mCurrentSetName); }else{ mReadConf = 1; - Translator::GetInstance()->init(); } if (!nextDirectory(RESPATH"/sets/","_cards.dat")){ //Remove temporary translations diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index 2c20758a9..cc6eb001e 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -313,8 +313,8 @@ bool MTGAllCards::addCardToCollection(MTGCard * card, int setId){ bool MTGAllCards::addPrimitive(CardPrimitive * primitive, MTGCard * card){ string key; if (card) { - std::stringstream ss; - ss << card->getId(); + std::stringstream ss; + ss << card->getId(); ss >> key; } else key = primitive->name; @@ -334,6 +334,9 @@ bool MTGAllCards::addPrimitive(CardPrimitive * primitive, MTGCard * card){ map::iterator it = t->tempValues.find(primitive->name); if (it != t->tempValues.end()) { primitive->setText(it->second); + }else if (primitive->text.size()){ + OutputDebugString(primitive->name.c_str()); + OutputDebugString("\n"); } primitives[key] = primitive; return true;