added MnGuyens further improved menu handling and extra options.

projects/mtg/include/DeckManager.h

@@ -1,5 +1,6 @@
 #include <string>
 #include <vector>
+#include "DeckMetaData.h"
 
 using namespace std;
 
@@ -12,12 +13,12 @@ protected:
 public:
     
 
-    vector<int> playerDeckOrderList;
+    vector<DeckMetaData *> playerDeckOrderList;
-    vector<int> aiDeckOrderList;
+    vector<DeckMetaData *> aiDeckOrderList;
 
-
+    void updateMetaDataList(vector<DeckMetaData *>* refList, bool isAI );
-    vector<int> * getPlayerDeckOrderList();
+    vector<DeckMetaData *> * getPlayerDeckOrderList();
-    vector<int> * getAIDeckOrderList();
+    vector<DeckMetaData *> * getAIDeckOrderList();
         
     static DeckManager * GetInstance();
     static void EndInstance();

projects/mtg/include/DeckMetaData.h

@@ -4,29 +4,39 @@
 #include <string>
 #include <vector>
 #include <map>
+#include "../include/DeckStats.h"
+
 
 using namespace std;
+enum DECK_DIFFICULTY
+{
+    HARD = -1,
+    NORMAL = 0,
+    EASY = 1
+};
     
 class DeckMetaData {
 public:
   DeckMetaData();
-  DeckMetaData(string filename);
+  DeckMetaData(string filename, Player * statsPlayer);
   void load(string filename);
-  bool operator<(DeckMetaData b);
+  void loadStatsForPlayer( Player * statsPlayer, string opponentDeckName = "" );
+  
+  string getDescription();
   
   string desc;
   string name;
   int deckid;
 
-      string& trim(string &str);
+  // statistical information
-    string& ltrim(string &str);
+  
-    string& rtrim(string &str);
+  int nbGamesPlayed, victories, percentVictories, difficulty;
 };
 
 class DeckMetaDataList {
 public:
   void invalidate(string filename);
-  DeckMetaData * get(string filename);
+  DeckMetaData * get(string filename, Player * statsPlayer = NULL);
   ~DeckMetaDataList();
   static DeckMetaDataList * decksMetaData;
 

projects/mtg/include/GameState.h

@@ -9,6 +9,8 @@ class JGE;
 #include <string>
 #include <vector>
 #include <iostream>
+#include "../include/DeckMetaData.h"
+
 using namespace std;
 
 enum ENUM_GAME_STATE
@@ -54,15 +56,25 @@ class GameState
 
   virtual void Update(float dt) = 0;
   virtual void Render() = 0;
-  static int fillDeckMenu(SimpleMenu * _menu, string path, string smallDeckPrefix = "", Player * statsPlayer = NULL);
-  static int fillDeckMenu( vector<int> * deckIdList, SimpleMenu * _menu, string path, string smallDeckPrefix = "", Player * statsPlayer = NULL);
 
-    string& trim(string &str);
+  // deck manipulation methods
-    string& ltrim(string &str);
+  // 2010/09/15:
-    string& rtrim(string &str);
+  // this was originally one method to do everything.  That has been split up into two distinct
+  // methods since the original was building a menu and returning a value.  The first 
+  // creates the vector containing the deck information.  The second will render that information
+  // 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);
+  
+  // build a vector of decks with the information passsed in. 
+  static vector<DeckMetaData *> getValidDeckMetaData(string path, string smallDeckPrefix = "", Player * statsPlayer = NULL);
+  
+  // build menu items based on the vector<DeckMetaData *>
+  static void renderDeckMenu(SimpleMenu * _menu, vector<DeckMetaData *> deckMetaDataList);
   
   };
-
+  bool sortByName( DeckMetaData * d1, DeckMetaData * d2 );
 
 #endif
 

projects/mtg/include/GameStateDeckViewer.h

@@ -35,6 +35,36 @@ enum
   };
 
 
+// TODO: need a better name for MENU_FIRST_MENU, this is reused for the 1st submenu of
+// available options in the duel menu
+enum
+{
+    MENU_CARD_PURCHASE = 2,
+    MENU_DECK_SELECTION = 10,
+    MENU_DECK_BUILDER = 11,
+    MENU_FIRST_DUEL_SUBMENU = 102,
+    MENU_LANGUAGE_SELECTION = 103,
+};
+
+  // enums for menu options
+  // TODO: make these enums a little more descriptive. (ie should reflect what menu they are attached to )
+enum DECK_VIEWER_MENU_ITEMS
+  {
+    MENU_ITEM_NEW_DECK = -30,
+    MENU_ITEM_CHEAT_MODE = -12,
+    MENU_ITEM_CANCEL = -1,
+    MENU_ITEM_SAVE_RETURN_MAIN_MENU = 0,
+    MENU_ITEM_SAVE_RENAME = 1,
+    MENU_ITEM_SWITCH_DECKS_NO_SAVE = 2,
+    MENU_ITEM_MAIN_MENU = 3,
+    MENU_ITEM_EDITOR_CANCEL = 4,
+    MENU_ITEM_YES = 20,
+    MENU_ITEM_NO = 21,
+    MENU_ITEM_FILTER_BY = 22
+
+
+  };
+
 #define ALL_COLORS -1
 
 #define ROTATE_LEFT 1;

projects/mtg/include/GameStateDuel.h

@@ -53,6 +53,16 @@ class GameStateDuel: public GameState, public JGuiListener
   virtual void Render();
   void initRand (unsigned seed = 0);
   
+  enum ENUM_DUEL_STATE_MENU_ITEM
+  {
+    MENUITEM_NEW_DECK = -1,
+    MENUITEM_CANCEL = -10,
+    MENUITEM_RANDOM_PLAYER = -11,
+    MENUITEM_RANDOM_AI = -12,
+    MENUITEM_MAIN_MENU = -13,
+    MENUITEM_EVIL_TWIN = -14
+  };
+
 };
 
 

projects/mtg/include/GameStateMenu.h

@@ -67,6 +67,15 @@ class GameStateMenu: public GameState, public JGuiListener
   void resetDirectory();
   void createUsersFirstDeck(int setId);
   virtual ostream& toString(ostream& out) const;
+
+  enum
+{
+    MENU_CARD_PURCHASE = 2,
+    MENU_DECK_SELECTION = 10,
+    MENU_DECK_BUILDER = 11,
+    MENU_FIRST_DUEL_SUBMENU = 102,
+    MENU_LANGUAGE_SELECTION = 103,
+};
 };
 
 #endif

projects/mtg/include/utils.h

@@ -33,9 +33,10 @@
 
 using std::string;
 
-
+//string manipulation methods
-
+string& trim(string &str);
-
+string& ltrim(string &str);
+string& rtrim(string &str);
 
 int loadRandValues(string s);
 int filesize(const char * filename);

projects/mtg/src/AIPlayer.cpp

@@ -5,6 +5,7 @@
 #include "../include/AllAbilities.h"
 #include "../include/ExtraCost.h"
 #include "../include/GuiCombat.h"
+#include "../include/GameStateDuel.h"
 
 const char * const MTG_LAND_TEXTS[] = {"artifact","forest","island","mountain","swamp","plains","other lands"};
 
@@ -575,7 +576,7 @@ AIPlayer * AIPlayerFactory::createAIPlayer(MTGAllCards * collection, Player * op
   char avatarFile[512];
   char deckFileSmall[512];
 
-  if (deckid == -1){ //Evil twin
+  if (deckid == GameStateDuel::MENUITEM_EVIL_TWIN){ //Evil twin
     sprintf(deckFile, "%s", opponent->deckFile.c_str());
     OutputDebugString(opponent->deckFile.c_str());  
     sprintf(avatarFile, "%s", "baka.jpg");

projects/mtg/src/DeckManager.cpp

@@ -9,13 +9,23 @@ DeckManager::~DeckManager()
 {
 }
 
+void DeckManager::updateMetaDataList( vector<DeckMetaData *> * refList, bool isAI )
+{
+  if (refList)
+  {
+    vector<DeckMetaData *> * inputList = isAI? &aiDeckOrderList : &playerDeckOrderList;
+    inputList->clear();
+    inputList->assign( refList->begin(), refList->end());
+  }
+}
 
-vector<int> * DeckManager::getPlayerDeckOrderList()
+
+vector<DeckMetaData *> * DeckManager::getPlayerDeckOrderList()
 {
     return &playerDeckOrderList;
 }
     
-vector<int> * DeckManager::getAIDeckOrderList()
+vector<DeckMetaData *> * DeckManager::getAIDeckOrderList()
 {
     return &aiDeckOrderList;
 }
@@ -33,6 +43,5 @@ DeckManager* DeckManager::GetInstance()
 
 void DeckManager::EndInstance()
 {
-
   SAFE_DELETE(mInstance);
 }

projects/mtg/src/DeckMetaData.cpp

@@ -1,6 +1,9 @@
 #include "../include/DeckMetaData.h"
+#include "../include/DeckStats.h"
 #include "../include/MTGDeck.h"
 #include "../include/config.h"
+#include "../include/utils.h"
+
 //Possible improvements:
 //Merge this with DeckStats
 //Have this class handle all the Meta Data rather than relying on MTGDeck. Then MTGDeck would have a MetaData object...
@@ -12,25 +15,75 @@ DeckMetaData::DeckMetaData(){
   
 }
 
-DeckMetaData::DeckMetaData(string filename){
+DeckMetaData::DeckMetaData(string filename, Player * statsPlayer){
   load(filename);
 }
 
+
+void DeckMetaData::loadStatsForPlayer( Player * statsPlayer, string deckStatsFileName )
+{
+    DeckStats * stats = DeckStats::GetInstance();
+    if ( statsPlayer )
+    {
+      stats->load(statsPlayer);
+      DeckStat * opponentDeckStats = stats->getDeckStat(deckStatsFileName);
+      if ( opponentDeckStats )
+      {
+        percentVictories = stats->percentVictories(deckStatsFileName);
+        victories = opponentDeckStats->victories;
+        nbGamesPlayed = opponentDeckStats->nbgames;
+        if (percentVictories < 34){
+          difficulty = HARD;
+        }else if (percentVictories < 67){
+          difficulty = NORMAL;
+        }else{
+          difficulty = EASY;
+        }
+      }
+    }
+    else
+    {
+      if(fileExists(deckStatsFileName.c_str())){
+        stats->load(deckStatsFileName.c_str());
+        nbGamesPlayed = stats->nbGames();
+        percentVictories = stats->percentVictories();
+      }
+    }
+}
+      
+
+string DeckMetaData::getDescription()
+{
+    char deckDesc[512];
+    string difficultyString = "";
+    switch( difficulty )
+    {
+        case HARD: 
+            difficultyString = "Hard";
+            break;
+        case EASY:
+            difficultyString = "Easy";
+            break;
+    }
+    if ( nbGamesPlayed > 0 && difficultyString != "")    
+        sprintf(deckDesc, "Difficulty: %s\nVictory %%: %i\nGames Played: %i\n\n%s", difficultyString.c_str(), percentVictories, nbGamesPlayed, desc.c_str() );
+    else if ( nbGamesPlayed > 0 )
+        sprintf(deckDesc, "Victory %%: %i\nGames Played: %i\n\n%s", percentVictories, nbGamesPlayed, desc.c_str() );
+    else
+        return desc.c_str();
+    return deckDesc;
+}
+      
 void DeckMetaData::load(string filename){
   MTGDeck * mtgd = NEW MTGDeck(filename.c_str(),NULL,1);
-  name = DeckMetaData::trim( mtgd->meta_name );
+  name = trim( mtgd->meta_name );
-  desc =  DeckMetaData::trim( mtgd->meta_desc );
+  desc =  trim( mtgd->meta_desc );
   deckid = atoi( (filename.substr( filename.find("deck") + 4, filename.find(".txt") )).c_str() );
+  
   delete(mtgd);
 }
 
 
-// Must define less than relative to DeckMetaData objects.
-bool DeckMetaData::operator<(DeckMetaData b)
-{
-    return strcmp(name.c_str(), b.name.c_str()) < 0;
-}
-
 DeckMetaDataList::~DeckMetaDataList(){
   for(map<string,DeckMetaData *>::iterator it = values.begin(); it != values.end(); ++it){
     SAFE_DELETE(it->second);
@@ -46,11 +99,12 @@ void DeckMetaDataList::invalidate(string filename){
    }
 }
 
-DeckMetaData * DeckMetaDataList::get(string filename){
+
+DeckMetaData * DeckMetaDataList::get(string filename, Player * statsPlayer){
   map<string,DeckMetaData *>::iterator it = values.find(filename);
   if (it ==values.end()){
     if (fileExists(filename.c_str())) {
-      values[filename] = NEW DeckMetaData(filename);
+      values[filename] = NEW DeckMetaData(filename, statsPlayer);
     }
   }
 
@@ -58,44 +112,3 @@ DeckMetaData * DeckMetaDataList::get(string filename){
 }
 
 
-
-string& DeckMetaData::trim(string &str)
-{
-    int i,j,start,end;
-
-    //ltrim
-    for (i=0; (str[i]!=0 && str[i]<=32); )
-        i++;
-    start=i;
-
-    //rtrim
-    for(i=0,j=0; str[i]!=0; i++)
-        j = ((str[i]<=32)? j+1 : 0);
-    end=i-j;
-    str = str.substr(start,end-start);
-    return str;
-}
-
-
-string& DeckMetaData::ltrim(string &str)
-{
-    int i,start;
-
-    for (i=0; (str[i]!=0 && str[i]<=32); )
-        i++;
-    start=i;
-
-    str = str.substr(start,str.length()-start);
-    return str;
-}
-string& DeckMetaData::rtrim(string &str)
-{
-    int i,j,end;
-
-    for(i=0,j=0; str[i]!=0; i++)
-        j = ((str[i]<=32)? j+1 : 0);
-    end=i-j;
-
-    str = str.substr(0,end);
-    return str;
-}

projects/mtg/src/GameState.cpp

@@ -5,112 +5,94 @@
 #include "../include/SimpleMenu.h"
 #include "../include/DeckStats.h"
 #include "../include/DeckMetaData.h"
+#include "../include/Player.h"
 #include <vector>
 
-int GameState::fillDeckMenu(SimpleMenu * _menu, string path, string smallDeckPrefix, Player * statsPlayer){
+// The purpose of this method is to create a listing of decks to be used for the input menu
-  DeckMetaDataList * metas = DeckMetaDataList::decksMetaData;
+// by default, the list will be sorted by name
-  int found = 1;
+// TODO: revise sorting strategy to allow other types of sorting.  Currently, it is hardwired to use
-  int nbDecks = 0;
+//    sortByName to do the sorting.  This was done since the menu item display is done in insertion order.
-  _menu->autoTranslate = false;
-  while (found){
-    found = 0;
-    char buffer[512];
-    char smallDeckName[512];
-    char deckDesc[512];
-    sprintf(buffer, "%s/deck%i.txt",path.c_str(),nbDecks+1);
-    if(DeckMetaData * meta = metas->get(buffer)){
-      found = 1;
-      nbDecks++;
-      sprintf(smallDeckName, "%s_deck%i",smallDeckPrefix.c_str(),nbDecks);
 
-      if (statsPlayer){
+vector<DeckMetaData *> GameState::fillDeckMenu( SimpleMenu * _menu, string path, string smallDeckPrefix, Player * statsPlayer){
-        DeckStats * stats = DeckStats::GetInstance();
+  _menu->autoTranslate = false;
-        stats->load(statsPlayer);
+  vector<DeckMetaData *> deckMetaDataVector = getValidDeckMetaData( path, smallDeckPrefix, statsPlayer );
-        int percentVictories = stats->percentVictories(string(smallDeckName));
+  renderDeckMenu( _menu, deckMetaDataVector);
-        string difficulty;
+  
-        if (percentVictories < 34){
+  return deckMetaDataVector;
-          difficulty = "(hard)";
-        }else if (percentVictories < 67){
-          difficulty = "";
-        }else{
-          difficulty = "(easy)";
-        }
-        sprintf(deckDesc, "%s %s",meta->name.c_str(), _(difficulty).c_str());
-      }else{
-        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->Add(nbDecks,deckDesc,meta->desc);
-    }
-  }
-  return nbDecks;
 }
 
-int GameState::fillDeckMenu(vector<int> * deckIdList, SimpleMenu * _menu, string path, string smallDeckPrefix, Player * statsPlayer){
+
+vector<DeckMetaData *> GameState::getValidDeckMetaData( string path, string smallDeckPrefix, Player * statsPlayer)
+{
+  vector<DeckMetaData*> retList;
+  
   DeckMetaDataList * metas = DeckMetaDataList::decksMetaData;
   int found = 1;
-  int nbDecks = 0;
+  int nbDecks = 1;
-  _menu->autoTranslate = false;
-  map<string,DeckMetaData> menu;
-  list<string> deckNameVector;
   while (found){
     found = 0;
     char buffer[512];
     char smallDeckName[512];
     char deckDesc[512];
-    sprintf(buffer, "%s/deck%i.txt",path.c_str(),nbDecks+1);
+    sprintf(buffer, "%s/deck%i.txt",path.c_str(),nbDecks);
-    if(DeckMetaData * meta = metas->get(buffer)){
+    if(DeckMetaData * meta = metas->get(buffer, statsPlayer)){
       found = 1;
-      nbDecks++;
       sprintf(smallDeckName, "%s_deck%i",smallDeckPrefix.c_str(),nbDecks);
+      sprintf(deckDesc, "%s",meta->name.c_str());
 
       if (statsPlayer){
-        DeckStats * stats = DeckStats::GetInstance();
+        string smallDeckNameStr = string(smallDeckName);
-        stats->load(statsPlayer);
+        meta->loadStatsForPlayer( statsPlayer, smallDeckNameStr );
-        int percentVictories = stats->percentVictories(string(smallDeckName));
-        string difficulty;
-        if (percentVictories < 34){
-          difficulty = "(hard)";
-        }else if (percentVictories < 67){
-          difficulty = "";
-        }else{
-          difficulty = "(easy)";
       }
-        sprintf(deckDesc, "%s %s",meta->name.c_str(), _(difficulty).c_str());
+      else
-      }else{
+      {
-        sprintf(deckDesc, "%s",meta->name.c_str());
+        char playerStatsDeckName[512];
+        
+        sprintf(playerStatsDeckName, "stats/player_deck%i.txt", nbDecks);
+        string deckstats = options.profileFile(playerStatsDeckName);
+        meta->loadStatsForPlayer( NULL, deckstats );
       }
+      
       deckDesc[16] = 0;
-      menu[deckDesc] = *meta;
+      retList.push_back( meta );
-      deckNameVector.push_back( deckDesc );        
+      nbDecks++;
     }
   }
 
-    deckNameVector.sort();
+  std::sort( retList.begin(), retList.end(), sortByName);
+
+  return retList;
+
+}
+
+
+// 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 )
+{
   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++)
+  for (vector<DeckMetaData *>::iterator i = deckMetaDataList.begin(); i != deckMetaDataList.end(); i++)
   {
-        string deckName = *i;
+    DeckMetaData * deckMetaData = *i;
-        DeckMetaData meta = menu[ deckName ];
+    string deckName = deckMetaData -> name;
-        string deckDescription = meta.desc;
+    string deckDescription = deckMetaData -> getDescription();
-        deckIdList->push_back( meta.deckid );
     //translate decks desc
-      it = t->deckValues.find(meta.name);
+    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());
   }
-  return nbDecks;
 }
 
+
+// deck sorting routines
+bool sortByName( DeckMetaData * d1, DeckMetaData * d2 )
+{
+  return strcmp( d1->name.c_str(), d2->name.c_str()) < 0;
+
+}
+
+
+//end deck sorting routine

projects/mtg/src/GameStateDeckViewer.cpp

@@ -4,6 +4,7 @@
 #include <JGE.h>
 #include "../include/config.h"
 #include "../include/DeckManager.h"
+#include "../include/GameStateDuel.h"
 #include "../include/GameStateDeckViewer.h"
 #include "../include/Translate.h"
 #include "../include/ManaCostHybrid.h"
@@ -103,15 +104,22 @@ void GameStateDeckViewer::switchDisplay(){
 
 void GameStateDeckViewer::updateDecks(){
   SAFE_DELETE(welcome_menu);
-  welcome_menu = NEW SimpleMenu(10,this,Constants::MENU_FONT,20,20);
+  welcome_menu = NEW SimpleMenu( MENU_DECK_SELECTION, this, Constants::MENU_FONT,20,20);
   DeckManager * deckManager = DeckManager::GetInstance();
-  nbDecks = fillDeckMenu( deckManager->getPlayerDeckOrderList(), welcome_menu,options.profileFile());
+  vector<DeckMetaData *> playerDeckList = fillDeckMenu( welcome_menu,options.profileFile());
+
   deckNum = 0;
   newDeckname = "";
-  welcome_menu->Add(nbDecks+1, _("--NEW--").c_str());
+  nbDecks = playerDeckList.size() + 1;
+  welcome_menu->Add( MENU_ITEM_NEW_DECK, _("--NEW--").c_str() );
   if(options[Options::CHEATMODE].number && (!myCollection || myCollection->getCount(WSrcDeck::UNFILTERED_MIN_COPIES) < 4))
-      welcome_menu->Add(-12,"--UNLOCK CARDS--");
+    welcome_menu->Add( MENU_ITEM_CHEAT_MODE, "--UNLOCK CARDS--" );
-  welcome_menu->Add(-1, _("Cancel").c_str());
+  welcome_menu->Add( MENU_ITEM_CANCEL, _("Cancel").c_str() );
+
+  // update the deckmanager with the latest information
+  deckManager->updateMetaDataList( &playerDeckList, false);
+  // is this necessary to ensure no memory leaks?
+  playerDeckList.clear();
 }
 
 void GameStateDeckViewer::Start()
@@ -134,13 +142,13 @@ void GameStateDeckViewer::Start()
   myCollection->Sort(WSrcCards::SORT_ALPHA);
   displayed_deck =  myCollection;
   //Build menu.
-  menu = NEW SimpleMenu(11,this,Constants::MENU_FONT,SCREEN_WIDTH/2-150,20);
+  menu = NEW SimpleMenu( MENU_DECK_BUILDER, this, Constants::MENU_FONT,SCREEN_WIDTH/2-150,20);
-  menu->Add(22,"Filter by...");
+  menu->Add( MENU_ITEM_FILTER_BY, "Filter by...");
-  menu->Add(2,"Switch decks without saving");
+  menu->Add( MENU_ITEM_SWITCH_DECKS_NO_SAVE, "Switch decks without saving");
-  menu->Add(1,"Save & Rename");
+  menu->Add( MENU_ITEM_SAVE_RENAME, "Save & Rename");
-  menu->Add(0,"Save & Back to Main Menu");
+  menu->Add( MENU_ITEM_SAVE_RETURN_MAIN_MENU, "Save & Back to Main Menu");
-  menu->Add(3,"Back to Main Menu");
+  menu->Add( MENU_ITEM_MAIN_MENU, "Back to Main Menu");
-  menu->Add(4,"Cancel");
+  menu->Add( MENU_ITEM_EDITOR_CANCEL, "Cancel");
 
   //Icons
   mIcons[Constants::MTG_COLOR_ARTIFACT] = resources.GetQuad("c_artifact");
@@ -302,9 +310,9 @@ void GameStateDeckViewer::Update(float dt)
         if (card && displayed_deck->count(card)){
           price = pricelist->getSellPrice(card->getMTGId());
           sprintf(buffer,"%s : %i %s",_(card->data->getName()).c_str(),price,_("credits").c_str());
-          subMenu = NEW SimpleMenu(2,this,Constants::MAIN_FONT,SCREEN_WIDTH-300,SCREEN_HEIGHT/2,buffer);
+          subMenu = NEW SimpleMenu( MENU_CARD_PURCHASE, this, Constants::MAIN_FONT,SCREEN_WIDTH-300,SCREEN_HEIGHT/2,buffer);
-          subMenu->Add(20,"Yes");
+          subMenu->Add( MENU_ITEM_YES,"Yes");
-          subMenu->Add(21,"No","",true);
+          subMenu->Add( MENU_ITEM_NO,"No","",true);
         }
       }
       stw.needUpdate = true;
@@ -1433,10 +1441,10 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
   int deckIdNumber = controlId;
   int deckListSize = 0;
   DeckManager *deckManager = DeckManager::GetInstance();
-  vector<int> * deckList;
+  vector<DeckMetaData *> * deckList;
   switch(controllerId){
-      case 10:  //Deck menu
+      case MENU_DECK_SELECTION:  //Deck menu
-        if (controlId == -1){
+        if (controlId == MENU_ITEM_CANCEL){
           if(!mSwitching)
             mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU);
           else
@@ -1444,7 +1452,7 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
 
           mSwitching = false;
           break;
-        } else if(controlId == -12){           // (PSY) Cheatmode: Complete the collection
+        } else if(controlId == MENU_ITEM_CHEAT_MODE){           // (PSY) Cheatmode: Complete the collection
           playerdata->collection->complete();  // Add the cards
           playerdata->collection->save();      // Save the new collection
           for(int i=0;i<setlist.size();i++){   // Update unlocked sets
@@ -1466,8 +1474,10 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
         deckList = deckManager->getPlayerDeckOrderList();
         deckListSize = deckList->size();
 
-        if (deckListSize > 0 && controlId < deckListSize)
+        if (controlId == MENU_ITEM_NEW_DECK) // new deck option selected
-            deckIdNumber = deckList->at(controlId - 1);
+          deckIdNumber = deckList->size() + 1;
+        else if (deckListSize > 0 && controlId <= deckListSize)
+          deckIdNumber = deckList->at(controlId - 1)->deckid;
         else
           deckIdNumber = controlId;
 
@@ -1475,41 +1485,43 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
         mStage = STAGE_WAITING;
         deckNum = controlId;
         break;
-      case 11: //Save / exit menu
+
+      case MENU_DECK_BUILDER: //Save / exit menu
         switch (controlId)
         {
 
-        case 0:
+        case MENU_ITEM_SAVE_RETURN_MAIN_MENU:
           saveDeck();
           mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU);
           break;
-        case 1:
+        case MENU_ITEM_SAVE_RENAME:
           if(myDeck && myDeck->parent){
             options.keypadStart(myDeck->parent->meta_name,&newDeckname);
             options.keypadTitle("Rename deck");
           }
           break;
-        case 2:
+        case MENU_ITEM_SWITCH_DECKS_NO_SAVE:
           updateDecks();
           mStage =  STAGE_WELCOME;
           mSwitching = true;
           break;
-        case 3:
+        case MENU_ITEM_MAIN_MENU:
           mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU);
           break;
-        case 4:
+        case MENU_ITEM_EDITOR_CANCEL:
           mStage =  STAGE_WAITING;
           break;
-        case 22:
+        case MENU_ITEM_FILTER_BY:
           mStage = STAGE_FILTERS;         
           if(!filterMenu) rebuildFilters();
           filterMenu->Entering(JGE_BTN_NONE);       
           break;
         }
         break;
-    case 2:
+
+      case MENU_CARD_PURCHASE: // Yes/ No sub menu.
         switch (controlId){
-      case 20:
+      case MENU_ITEM_YES:
         {
           MTGCard * card  = cardIndex[2];
           if (card){
@@ -1524,7 +1536,7 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
             loadIndexes();
           }
         }
-      case 21:
+      case MENU_ITEM_NO:
         subMenu->Close();
         break;
         }

projects/mtg/src/GameStateDuel.cpp

@@ -87,14 +87,27 @@ void GameStateDuel::Start()
 
   int decksneeded = 0;
   
-
   for (int i = 0; i<2; i ++){
     if (mParent->players[i] ==  PLAYER_TYPE_HUMAN){
       decksneeded = 1;
       deckmenu = NEW SimpleMenu(DUEL_MENU_CHOOSE_DECK, this, Constants::MENU_FONT, 35, 25, "Choose a Deck");
+
       DeckManager *deckManager = DeckManager::GetInstance();
-      int nbDecks = fillDeckMenu( deckManager->getPlayerDeckOrderList(), deckmenu, options.profileFile());
+      vector<DeckMetaData *> playerDeckList = getValidDeckMetaData( options.profileFile() );
-      if (nbDecks) decksneeded = 0;
+      int nbDecks = playerDeckList.size();
+
+      if (nbDecks) 
+      {
+        decksneeded = 0;
+				if (nbDecks > 1 )
+					deckmenu->Add( MENUITEM_RANDOM_PLAYER, "Random", "Play with a random deck." );
+      }
+
+      renderDeckMenu( deckmenu, playerDeckList );
+      // save the changes to the player deck list maintained in DeckManager
+      deckManager->updateMetaDataList( &playerDeckList, false);
+      playerDeckList.clear();
+
       break;
     }
   }
@@ -105,14 +118,14 @@ void GameStateDuel::Start()
         Translator * t = Translator::GetInstance();
         map<string,string>::iterator it = t->deckValues.find("Create your Deck!");
         if (it != t->deckValues.end())
-          deckmenu->Add(-1,_("Create your Deck!").c_str(), it->second);
+          deckmenu->Add( MENUITEM_NEW_DECK, _("Create your Deck!").c_str(), it->second);
         else
-          deckmenu->Add(-1,_("Create your Deck!").c_str(),"Highly recommended to get\nthe full Wagic experience!");
+          deckmenu->Add( MENUITEM_NEW_DECK, _("Create your Deck!").c_str(),"Highly recommended to get\nthe full Wagic experience!");
         premadeDeck = true;
         fillDeckMenu(deckmenu,RESPATH"/player/premade");
     }
-    deckmenu->Add(-1,_("New Deck...").c_str());
+    deckmenu->Add( MENUITEM_NEW_DECK, _("New Deck...").c_str());
-    deckmenu->Add(-2, "Main Menu", "Return to Main Menu" );
+    deckmenu->Add( MENUITEM_MAIN_MENU, "Main Menu", "Return to Main Menu" );
   }
   
   for (int i = 0; i < 2; ++i){
@@ -122,8 +135,8 @@ void GameStateDuel::Start()
 }
 
 void GameStateDuel::loadPlayer(int playerId, int decknb, int isAI){
-  if (decknb){
+  if (decknb) {
-    if (!isAI){ //Human Player
+    if (!isAI) { //Human Player
       char deckFile[255];
       if(premadeDeck)
         sprintf(deckFile, RESPATH"/player/premade/deck%i.txt",decknb);
@@ -135,14 +148,16 @@ void GameStateDuel::loadPlayer(int playerId, int decknb, int isAI){
       deck[playerId] = NEW MTGPlayerCards(tempDeck);
       delete tempDeck;
       mPlayers[playerId] = NEW HumanPlayer(deck[playerId],deckFile, deckFileSmall);
-    }else{ //AI Player, chose deck
+    } 
+    else { //AI Player, chose deck
           AIPlayerFactory playerCreator;
           Player * opponent = NULL;
           if (playerId == 1) opponent = mPlayers[0];
           mPlayers[playerId] = playerCreator.createAIPlayer(mParent->collection,opponent,decknb);
           deck[playerId] = mPlayers[playerId]->game;
     }
-  }else{ //Random AI deck
+  }
+  else { //Random AI deck
     AIPlayerFactory playerCreator;
     Player * opponent = NULL;
     if (playerId == 1) opponent = mPlayers[0];
@@ -221,12 +236,13 @@ bool GameStateDuel::MusicExist(string FileName){
 void GameStateDuel::ensureOpponentMenu(){
   if (!opponentMenu){
     opponentMenu = NEW SimpleMenu(DUEL_MENU_CHOOSE_OPPONENT, this, Constants::MENU_FONT, 35, 25, "Choose Opponent");
-    opponentMenu->Add(0,"Random");
+    opponentMenu->Add( MENUITEM_RANDOM_AI, "Random");
     if (options[Options::EVILTWIN_MODE_UNLOCKED].number)
-      opponentMenu->Add(-1,"Evil Twin", "Can you play against yourself?");
+      opponentMenu->Add( MENUITEM_EVIL_TWIN, "Evil Twin", "Can you play against yourself?");
     DeckManager * deckManager = DeckManager::GetInstance();
-    fillDeckMenu( deckManager->getAIDeckOrderList(), opponentMenu, RESPATH"/ai/baka", "ai_baka", mPlayers[0]);
+    vector<DeckMetaData* > opponentDeckList = fillDeckMenu( opponentMenu, RESPATH"/ai/baka", "ai_baka", mPlayers[0]);
-    opponentMenu->Add(-2,"Cancel", "Choose a different player deck");
+    deckManager->updateMetaDataList(&opponentDeckList, true);
+    opponentMenu->Add( MENUITEM_CANCEL, "Cancel", "Choose a different player deck");
   }
 }
 
@@ -368,7 +384,7 @@ void GameStateDuel::Update(float dt)
             menu->Add(14,"Mulligan");
           }
           //END almosthumane - mulligan
-          menu->Add(12,"Back to main menu");
+          menu->Add(12, "Back to main menu");
           menu->Add(13, "Cancel");
         }
         mGamePhase = DUEL_STATE_MENU;
@@ -492,7 +508,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId) {
     case DUEL_MENU_CHOOSE_OPPONENT:
       {
         switch(controlId){
-          case 0:
+          case MENUITEM_RANDOM_AI:
               loadPlayer(1);
 	          opponentMenu->Close();
 	          mGamePhase = DUEL_STATE_CHOOSE_DECK2_TO_PLAY;
@@ -500,7 +516,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId) {
           default:
             // cancel option.  return to player deck selection
 
-            if (controlId == -2) 
+            if (controlId == MENUITEM_CANCEL) 
             {
                 opponentMenu->Close();
                 deckmenu->Close();
@@ -508,8 +524,8 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId) {
                 mGamePhase = DUEL_MENU_GAME_MENU;
                 break;
             }
-            else if ( controlId != -1 && aiDeckSize > 0) // evil twin
+            else if ( controlId != MENUITEM_EVIL_TWIN && aiDeckSize > 0) // evil twin
-                deckNumber = deckManager->getAIDeckOrderList()->at( controlId - 1 );
+                deckNumber = deckManager->getAIDeckOrderList()->at( controlId - 1 )->deckid;
 
             loadPlayer(1,deckNumber,1);
 			      OpponentsDeckid=deckNumber;
@@ -521,9 +537,18 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId) {
       }
     case DUEL_MENU_CHOOSE_DECK:
       {
-        if (controlId == -2 ) // user clicked on "Cancel"
+        if ( controlId == MENUITEM_RANDOM_PLAYER ) // Random Player Deck Selection
         {
-            if ( deckmenu) 
+          vector<DeckMetaData *> * playerDeckList = deckManager->getPlayerDeckOrderList();
+          deckNumber = playerDeckList->at(WRand() * 1001 % (playerDeckList->size()) )->deckid;
+          loadPlayer( 0, deckNumber );
+          deckmenu->Close();
+          mGamePhase = DUEL_STATE_CHOOSE_DECK2_TO_PLAY;
+          break;
+        }
+        else if (controlId == MENUITEM_MAIN_MENU ) // user clicked on "Cancel"
+        {            
+            if (deckmenu) 
                 deckmenu->Close();
             mGamePhase = DUEL_STATE_BACK_TO_MAIN_MENU;
             break;
@@ -533,9 +558,9 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId) {
           return;
         }
         if (mGamePhase == DUEL_STATE_CHOOSE_DECK1){
-          vector<int> * playerDeck = deckManager->getPlayerDeckOrderList();
+          vector<DeckMetaData *> * playerDeck = deckManager->getPlayerDeckOrderList();
           if ( !premadeDeck && controlId > 0 )
-            deckNumber = playerDeck->at( controlId - 1 );
+            deckNumber = playerDeck->at( controlId - 1 )->deckid;
           loadPlayer(0,deckNumber);
           deckmenu->Close();
           mGamePhase = DUEL_STATE_CHOOSE_DECK1_TO_2;

projects/mtg/src/GameStateMenu.cpp

@@ -311,7 +311,7 @@ void GameStateMenu::setLang(int id){
 
 void GameStateMenu::loadLangMenu(){
   LOG("GameStateMenu::loadLangMenu");
-  subMenuController = NEW SimpleMenu(103, this, Constants::MENU_FONT, 150,60);
+  subMenuController = NEW SimpleMenu( MENU_LANGUAGE_SELECTION, this, Constants::MENU_FONT, 150,60);
   if (!subMenuController) return;
   resetDirectory();
   if (!mDip){
@@ -465,7 +465,7 @@ void GameStateMenu::Update(float dt)
       if (MENU_STATE_MINOR_NONE == (currentState & MENU_STATE_MINOR)) {
         if (!hasChosenGameType){
 	        currentState = MENU_STATE_MAJOR_SUBMENU;
-	        subMenuController = NEW SimpleMenu(102, this, Constants::MENU_FONT, 150,60);
+	        subMenuController = NEW SimpleMenu( MENU_FIRST_DUEL_SUBMENU, this, Constants::MENU_FONT, 150,60);
 	        if (subMenuController){
 	          subMenuController->Add(SUBMENUITEM_CLASSIC,"Classic");
 	          if (options[Options::MOMIR_MODE_UNLOCKED].number)
@@ -637,7 +637,7 @@ WFont * mFont = resources.GetWFont(Constants::MENU_FONT);
   OutputDebugString(buf);
 #endif
   switch (controllerId){
-  case 103:
+  case MENU_LANGUAGE_SELECTION:
     setLang(controlId);
     resources.reloadWFonts(); // Fix for choosing Chinese language at first time.
     subMenuController->Close();
@@ -651,7 +651,7 @@ WFont * mFont = resources.GetWFont(Constants::MENU_FONT);
     switch (controlId)
       {
       case MENUITEM_PLAY:
-	    subMenuController = NEW SimpleMenu(102, this, Constants::MENU_FONT, 150,60);
+	    subMenuController = NEW SimpleMenu( MENU_FIRST_DUEL_SUBMENU, this, Constants::MENU_FONT, 150,60);
 	    if (subMenuController){
 	      subMenuController->Add(SUBMENUITEM_1PLAYER,"1 Player");
         // TODO Put 2 players mode back

projects/mtg/src/utils.cpp

@@ -180,3 +180,46 @@ u32 ramAvailable (void)
 
  return size;
 } 
+
+
+
+string& trim(string &str)
+{
+    int i,j,start,end;
+
+    //ltrim
+    for (i=0; (str[i]!=0 && str[i]<=32); )
+        i++;
+    start=i;
+
+    //rtrim
+    for(i=0,j=0; str[i]!=0; i++)
+        j = ((str[i]<=32)? j+1 : 0);
+    end=i-j;
+    str = str.substr(start,end-start);
+    return str;
+}
+
+
+string& ltrim(string &str)
+{
+    int i,start;
+
+    for (i=0; (str[i]!=0 && str[i]<=32); )
+        i++;
+    start=i;
+
+    str = str.substr(start,str.length()-start);
+    return str;
+}
+string& rtrim(string &str)
+{
+    int i,j,end;
+
+    for(i=0,j=0; str[i]!=0; i++)
+        j = ((str[i]<=32)? j+1 : 0);
+    end=i-j;
+
+    str = str.substr(0,end);
+    return str;
+}