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

Fixed stupid problems introduced in previous commit. Bloody GCC with Werror is simply not enough :(

Browse Source
This commit is contained in:
Xawotihs
2011-10-27 18:58:54 +00:00
parent c3dc51aed1
commit 5f9e8e2588
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameObserver.cpp
+1 -1
View File
@@ -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); sprintf(deckFile, "%s/deck%i.txt", options.profileFile().c_str(), decknb);
char deckFileSmall[255]; char deckFileSmall[255];
sprintf(deckFileSmall, "player_deck%i", decknb); 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 #ifdef NETWORK_SUPPORT
// FIXME, this is broken // FIXME, this is broken
if(isNetwork) if(isNetwork)
projects/mtg/src/Rules.cpp
+2 -2
View File
@@ -245,7 +245,7 @@ Player * Rules::loadPlayerMomir(GameObserver* observer, int isAI)
Player *player = NULL; Player *player = NULL;
if (!isAI) // Human Player 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 else
player = NEW AIMomirPlayer(observer, options.profileFile("momir.txt", "", true).c_str(), deckFileSmall, empty, tempDeck); 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; Player *player = NULL;
if (!isAI) // Human Player if (!isAI) // Human Player
player = NEW HumanPlayer(observer, deckFile, deckFileSmall, tempDeck); player = NEW HumanPlayer(observer, deckFile, deckFileSmall, false, tempDeck);
else else
player = NEW AIPlayerBaka(observer, deckFile, deckFileSmall, "", tempDeck); player = NEW AIPlayerBaka(observer, deckFile, deckFileSmall, "", tempDeck);
projects/mtg/src/StoryFlow.cpp
+2 -1
View File
@@ -310,7 +310,8 @@ void StoryDuel::init()
sprintf(deckFile, "%s/deck.txt", folder); sprintf(deckFile, "%s/deck.txt", folder);
sprintf(deckFileSmall, "campaign_%s", mParent->folder.c_str()); 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(deckFile, "%s/opponent_deck.txt", folder);
sprintf(deckFileSmall, "campaign_ennemy_%s_%s", mParent->folder.c_str(), pageId.c_str()); sprintf(deckFileSmall, "campaign_ennemy_%s_%s", mParent->folder.c_str(), pageId.c_str());