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

- Fix issue 694

Browse Source 
- Bump version number to 0.16.0 for upcoming release
This commit is contained in:
wagic.the.homebrew
2011-07-05 13:02:41 +00:00
parent c25dfe426f
commit c3ae216f62
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/mtg/src/DeckStats.cpp
View File

@@ -123,8 +123,14 @@ void DeckStats::load(const std::string& filename)
int deckId = atoi(filename.substr(filename.find("_deck") + 5, filename.find(".txt")).c_str()); int deckId = atoi(filename.substr(filename.find("_deck") + 5, filename.find(".txt")).c_str());
char buffer[512]; char buffer[512];
sprintf(buffer, "deck%i.txt", deckId); sprintf(buffer, "deck%i.txt", deckId);
string playerDeckFilePath= options.profileFile( buffer); string playerDeckFilePath = options.profileFile( buffer);
DeckMetaData *playerDeckMetaData = DeckManager::GetInstance()->getDeckMetaDataByFilename( playerDeckFilePath, false); DeckMetaData *playerDeckMetaData = DeckManager::GetInstance()->getDeckMetaDataByFilename( playerDeckFilePath, false);
if (!playerDeckMetaData)
{
DebugTrace("DeckStats.cpp:CONSISTENCY ERROR: DeckStats are set, but no deck meta data");
file.close();
return;
}
// check if this player deck has already been profiled for manacolors // check if this player deck has already been profiled for manacolors
char next = file.peek(); char next = file.peek();
string manaColorIndex = ""; string manaColorIndex = "";

6
projects/mtg/src/GameStateDuel.cpp
View File

@@ -125,11 +125,11 @@ void GameStateDuel::Start()
vector<DeckMetaData *> playerDeckList = BuildDeckList(options.profileFile()); vector<DeckMetaData *> playerDeckList = BuildDeckList(options.profileFile());
int nbDecks = playerDeckList.size(); int nbDecks = playerDeckList.size();
if (nbDecks > 1) if (nbDecks)
{
decksneeded = 0; decksneeded = 0;
if (nbDecks > 1)
deckmenu->Add(MENUITEM_RANDOM_PLAYER, "Random", "Play with a random deck."); deckmenu->Add(MENUITEM_RANDOM_PLAYER, "Random", "Play with a random deck.");
}
renderDeckMenu(deckmenu, playerDeckList); renderDeckMenu(deckmenu, playerDeckList);
// save the changes to the player deck list maintained in DeckManager // save the changes to the player deck list maintained in DeckManager

2
projects/mtg/src/GameStateMenu.cpp
View File

@@ -25,7 +25,7 @@
#include <JNetwork.h> #include <JNetwork.h>
#endif//NETWORK_SUPPORT #endif//NETWORK_SUPPORT
static const char* GAME_VERSION = "WTH?! 0.15.1 - wololo.net"; static const char* GAME_VERSION = "WTH?! 0.16.0 - wololo.net";
enum ENUM_MENU_STATE_MAJOR enum ENUM_MENU_STATE_MAJOR
{ {