From 34bdfab36f82a340157a3eaf3cfe4afa9fcbe264 Mon Sep 17 00:00:00 2001 From: "techdragon.nguyen@gmail.com" Date: Fri, 22 Oct 2010 09:22:25 +0000 Subject: [PATCH] fixed bug with saving brand new AI decks. --- projects/mtg/include/DeckDataWrapper.h | 1 + projects/mtg/include/MTGDeck.h | 2 +- projects/mtg/src/DeckDataWrapper.cpp | 7 +++++++ projects/mtg/src/GameStateDeckViewer.cpp | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/projects/mtg/include/DeckDataWrapper.h b/projects/mtg/include/DeckDataWrapper.h index c32510a29..6d84da208 100644 --- a/projects/mtg/include/DeckDataWrapper.h +++ b/projects/mtg/include/DeckDataWrapper.h @@ -19,6 +19,7 @@ class DeckDataWrapper: public WSrcDeck { bool next() {currentPos++; return true;}; bool prev() {currentPos--; return true;}; void save(); + void save(string filepath, bool useExpandedCardNames); }; #endif diff --git a/projects/mtg/include/MTGDeck.h b/projects/mtg/include/MTGDeck.h index 359e8a673..2b5dd8852 100644 --- a/projects/mtg/include/MTGDeck.h +++ b/projects/mtg/include/MTGDeck.h @@ -150,7 +150,7 @@ class MTGDeck{ int add(MTGCard * card); int remove(MTGCard * card); int save(); - int save(string destFileName, bool useExpandedDescriptions, string deckName, string deckDesc); + int save(string destFileName, bool useExpandedDescriptions); MTGCard * getCardById(int id); }; diff --git a/projects/mtg/src/DeckDataWrapper.cpp b/projects/mtg/src/DeckDataWrapper.cpp index 56de0f50f..a624eacbc 100644 --- a/projects/mtg/src/DeckDataWrapper.cpp +++ b/projects/mtg/src/DeckDataWrapper.cpp @@ -15,3 +15,10 @@ void DeckDataWrapper::save(){ parent->save(); } } + +void DeckDataWrapper::save(string filepath, bool useExpandedCardNames){ + if(parent){ + Rebuild(parent); + parent->save(filepath, useExpandedCardNames); + } +} diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 36b024d83..7cd08cfeb 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -282,7 +282,10 @@ void GameStateDeckViewer::saveAsAIDeck( string deckName ) string filepath = RESPATH; filepath.append("/ai/baka/").append( defaultAiDeckName ).append( ".txt" ); DebugTrace("saving AI deck " << filepath << endl ); - myDeck->parent->save( filepath, true, deckName, deckDesc ); + myDeck->parent->meta_desc = deckDesc; + myDeck->parent->meta_name = deckName; + myDeck->save( filepath, true); + oss.clear(); delete deckManager; }