From 5f9e8e2588e1b79f68c56a319034a5f7ca214f0f Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Thu, 27 Oct 2011 18:58:54 +0000 Subject: [PATCH] Fixed stupid problems introduced in previous commit. Bloody GCC with Werror is simply not enough :( --- projects/mtg/src/GameObserver.cpp | 2 +- projects/mtg/src/Rules.cpp | 4 ++-- projects/mtg/src/StoryFlow.cpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index df620f4bb..25516ec7e 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -1582,7 +1582,7 @@ void GameObserver::loadPlayer(int playerId, PlayerType playerType, int decknb, b sprintf(deckFile, "%s/deck%i.txt", options.profileFile().c_str(), decknb); char deckFileSmall[255]; sprintf(deckFileSmall, "player_deck%i", decknb); - players.push_back(NEW HumanPlayer(this, deckFile, deckFileSmall)); + players.push_back(NEW HumanPlayer(this, deckFile, deckFileSmall, premadeDeck)); #ifdef NETWORK_SUPPORT // FIXME, this is broken if(isNetwork) diff --git a/projects/mtg/src/Rules.cpp b/projects/mtg/src/Rules.cpp index 29f8ab3ae..f47ebd3bc 100644 --- a/projects/mtg/src/Rules.cpp +++ b/projects/mtg/src/Rules.cpp @@ -245,7 +245,7 @@ Player * Rules::loadPlayerMomir(GameObserver* observer, int isAI) Player *player = NULL; if (!isAI) // Human Player - player = NEW HumanPlayer(observer, options.profileFile("momir.txt", "", true).c_str(), deckFileSmall, tempDeck); + player = NEW HumanPlayer(observer, options.profileFile("momir.txt", "", true).c_str(), deckFileSmall, false, tempDeck); else player = NEW AIMomirPlayer(observer, options.profileFile("momir.txt", "", true).c_str(), deckFileSmall, empty, tempDeck); @@ -279,7 +279,7 @@ Player * Rules::loadPlayerRandom(GameObserver* observer, int isAI, int mode) Player *player = NULL; if (!isAI) // Human Player - player = NEW HumanPlayer(observer, deckFile, deckFileSmall, tempDeck); + player = NEW HumanPlayer(observer, deckFile, deckFileSmall, false, tempDeck); else player = NEW AIPlayerBaka(observer, deckFile, deckFileSmall, "", tempDeck); diff --git a/projects/mtg/src/StoryFlow.cpp b/projects/mtg/src/StoryFlow.cpp index 1b1ffbb7b..b96ee9ef4 100644 --- a/projects/mtg/src/StoryFlow.cpp +++ b/projects/mtg/src/StoryFlow.cpp @@ -310,7 +310,8 @@ void StoryDuel::init() sprintf(deckFile, "%s/deck.txt", folder); sprintf(deckFileSmall, "campaign_%s", mParent->folder.c_str()); - players.push_back(NEW HumanPlayer(0, deckFile, deckFileSmall)); + players.push_back(NEW HumanPlayer(0, deckFile, deckFileSmall, true)); + sprintf(deckFile, "%s/opponent_deck.txt", folder); sprintf(deckFileSmall, "campaign_ennemy_%s_%s", mParent->folder.c_str(), pageId.c_str());