Minor code cleanup - pass by reference instead of value; instead of creating temp char arrays on each deck loop while building deck metadata, use an ostringstream when needed.

projects/mtg/include/GameState.h

@@ -66,19 +66,19 @@ class GameState
   // it makes it easier to manipulate the deck information menus.
   
   // generate the Deck Meta Data and build the menu items of the menu given
-  static vector<DeckMetaData *> fillDeckMenu(SimpleMenu * _menu, string path, string smallDeckPrefix = "", Player * statsPlayer = NULL);
+  static vector<DeckMetaData *> fillDeckMenu(SimpleMenu * _menu, const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL);
 
   // generate the Deck Meta Data and build the menu items of the menu given
-  static vector<DeckMetaData *> fillDeckMenu(DeckMenu * _menu, string path, string smallDeckPrefix = "", Player * statsPlayer = NULL);
+  static vector<DeckMetaData *> fillDeckMenu(DeckMenu * _menu, const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL);
   
   // build a vector of decks with the information passsed in. 
-  static vector<DeckMetaData *> getValidDeckMetaData(string path, string smallDeckPrefix = "", Player * statsPlayer = NULL);
+  static vector<DeckMetaData *> getValidDeckMetaData(const string& path, const string& smallDeckPrefix = "", Player * statsPlayer = NULL);
   
   // build menu items based on the vector<DeckMetaData *>
-  static void renderDeckMenu(SimpleMenu * _menu, vector<DeckMetaData *> deckMetaDataList);
+  static void renderDeckMenu(SimpleMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList);
 
     // build menu items based on the vector<DeckMetaData *>
-  static void renderDeckMenu(DeckMenu * _menu, vector<DeckMetaData *> deckMetaDataList);
+  static void renderDeckMenu(DeckMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList);
 
   };
   bool sortByName( DeckMetaData * d1, DeckMetaData * d2 );

projects/mtg/src/DeckMenu.cpp

@@ -211,19 +211,17 @@ void DeckMenu::Add(int id, const char * text,string desc, bool forceFocus, DeckM
   }
 }
 
-
 void DeckMenu::updateScroller()
 {
   // add all the items from the Tasks db.
-  TaskList *taskList = NEW TaskList();
+  TaskList taskList;
   scroller->Reset();
-  for (vector<Task*>::iterator it = taskList->tasks.begin(); it!=taskList->tasks.end(); it++)
+  for (vector<Task*>::iterator it = taskList.tasks.begin(); it!=taskList.tasks.end(); it++)
   {
     ostringstream taskDescription;
     taskDescription << "[ " << setw(4) << (*it)->getReward() << " / " << (*it)->getExpiration() << " ]   " << (*it)->getDesc() << endl;
     scroller->Add( taskDescription.str() );
   }
-  SAFE_DELETE(taskList);
 }
 
 
@@ -241,5 +239,4 @@ void DeckMenu::destroy(){
 DeckMenu::~DeckMenu()
 {
   SAFE_DELETE(scroller);
-
 }

projects/mtg/src/GameState.cpp

@@ -13,7 +13,7 @@
 // TODO: revise sorting strategy to allow other types of sorting.  Currently, it is hardwired to use
 //    sortByName to do the sorting.  This was done since the menu item display is done in insertion order.
 
-vector<DeckMetaData *> GameState::fillDeckMenu( SimpleMenu * _menu, string path, string smallDeckPrefix, Player * statsPlayer){
+vector<DeckMetaData *> GameState::fillDeckMenu( SimpleMenu * _menu, const string& path, const string& smallDeckPrefix, Player * statsPlayer){
   bool translate = _menu->autoTranslate;
   _menu->autoTranslate = false;
   vector<DeckMetaData *> deckMetaDataVector = getValidDeckMetaData( path, smallDeckPrefix, statsPlayer );
@@ -23,7 +23,7 @@ vector<DeckMetaData *> GameState::fillDeckMenu( SimpleMenu * _menu, string path,
   return deckMetaDataVector;
 }
 
-vector<DeckMetaData *> GameState::fillDeckMenu( DeckMenu * _menu, string path, string smallDeckPrefix, Player * statsPlayer){
+vector<DeckMetaData *> GameState::fillDeckMenu( DeckMenu * _menu, const string& path, const string& smallDeckPrefix, Player * statsPlayer){
   bool translate = _menu->autoTranslate;
   _menu->autoTranslate = false;
   vector<DeckMetaData *> deckMetaDataVector = getValidDeckMetaData( path, smallDeckPrefix, statsPlayer );
@@ -34,7 +34,7 @@ vector<DeckMetaData *> GameState::fillDeckMenu( DeckMenu * _menu, string path, s
 }
 
 
-vector<DeckMetaData *> GameState::getValidDeckMetaData( string path, string smallDeckPrefix, Player * statsPlayer)
+vector<DeckMetaData *> GameState::getValidDeckMetaData( const string& path, const string& smallDeckPrefix, Player * statsPlayer)
 {
   vector<DeckMetaData*> retList;
   
@@ -43,30 +43,25 @@ vector<DeckMetaData *> GameState::getValidDeckMetaData( string path, string smal
   int nbDecks = 1;
   while (found){
     found = 0;
-    char buffer[512];
+    std::ostringstream filename;
-    char smallDeckName[512];
+    filename << path << "/deck" << nbDecks << ".txt";
-    char deckDesc[512];
+    DeckMetaData * meta = metas->get(filename.str(), statsPlayer);
-    sprintf(buffer, "%s/deck%i.txt",path.c_str(),nbDecks);
-
-    DeckMetaData * meta = metas->get(buffer, statsPlayer);
     if (meta)
     {
       found = 1;
-      sprintf(smallDeckName, "%s_deck%i",smallDeckPrefix.c_str(),nbDecks);
       if (statsPlayer){
-        string smallDeckNameStr = string(smallDeckName);
+        std::ostringstream smallDeckName;
-        meta->loadStatsForPlayer( statsPlayer, smallDeckNameStr );
+        smallDeckName << smallDeckPrefix << "_deck" << nbDecks;
+        meta->loadStatsForPlayer( statsPlayer, smallDeckName.str());
       }
       else
       {
-        char playerStatsDeckName[512];
+        std::ostringstream playerStatsDeckName;
-
+        playerStatsDeckName << "stats/player_deck" << nbDecks << ".txt";
-        sprintf(playerStatsDeckName, "stats/player_deck%i.txt", nbDecks);
+        string deckstats = options.profileFile(playerStatsDeckName.str());
-        string deckstats = options.profileFile(playerStatsDeckName);
         meta->loadStatsForPlayer( NULL, deckstats );
       }
 
-      deckDesc[16] = 0;
       retList.push_back( meta );
       nbDecks++;
     }
@@ -81,12 +76,12 @@ vector<DeckMetaData *> GameState::getValidDeckMetaData( string path, string smal
 
 
 // build a menu with the given deck list and return a vector of the deck ids created.
-void GameState::renderDeckMenu ( SimpleMenu * _menu, vector<DeckMetaData *> deckMetaDataList )
+void GameState::renderDeckMenu ( SimpleMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList )
 {
   int deckNumber = 1;
   Translator * t = Translator::GetInstance();
   map<string,string>::iterator it;
-  for (vector<DeckMetaData *>::iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
+  for (vector<DeckMetaData *>::const_iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
   {
     DeckMetaData * deckMetaData = *i;
     string deckName = deckMetaData -> getName();
@@ -102,12 +97,12 @@ void GameState::renderDeckMenu ( SimpleMenu * _menu, vector<DeckMetaData *> deck
 
 
 // build a menu with the given deck list and return a vector of the deck ids created.
-void GameState::renderDeckMenu ( DeckMenu * _menu, vector<DeckMetaData *> deckMetaDataList )
+void GameState::renderDeckMenu ( DeckMenu * _menu, const vector<DeckMetaData *>& deckMetaDataList )
 {
   int deckNumber = 1;
   Translator * t = Translator::GetInstance();
   map<string,string>::iterator it;
-  for (vector<DeckMetaData *>::iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
+  for (vector<DeckMetaData *>::const_iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
   {
     DeckMetaData * deckMetaData = *i;
     string deckName = deckMetaData -> getName();