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

Fixed compilation issue on PSP/PSVITA after 76f5a6b commit.

Browse Source
This commit is contained in:
Vittorio Alfieri
2023-05-07 15:13:22 +02:00
parent ab6f80c242
commit 94d1267abf
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
projects/mtg/src/Rules.cpp
View File

@@ -418,20 +418,33 @@ Player * Rules::loadPlayerRandomFive(GameObserver* observer, int isAI)
Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI) Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI)
{ {
#if !defined (PSP)
std::unique_ptr<MTGDeck> cmdTempDeck(new MTGDeck(MTGCollection())); std::unique_ptr<MTGDeck> cmdTempDeck(new MTGDeck(MTGCollection()));
std::unique_ptr<MTGDeck> tempDeck(new MTGDeck(MTGCollection())); std::unique_ptr<MTGDeck> tempDeck(new MTGDeck(MTGCollection()));
#else
MTGDeck * cmdTempDeck = NEW MTGDeck(MTGCollection());
MTGDeck * tempDeck = NEW MTGDeck(MTGCollection());
#endif
tempDeck->meta_commander = true; tempDeck->meta_commander = true;
string lands[] = { "", "forest", "island", "mountain", "swamp", "plains", "basic", "basic" }; string lands[] = { "", "forest", "island", "mountain", "swamp", "plains", "basic", "basic" };
cmdTempDeck->addRandomCards(1, 0, 0, -1, "legendary"); cmdTempDeck->addRandomCards(1, 0, 0, -1, "legendary");
#if !defined (PSP)
std::unique_ptr<DeckDataWrapper> myCommandZone(new DeckDataWrapper(cmdTempDeck.get())); std::unique_ptr<DeckDataWrapper> myCommandZone(new DeckDataWrapper(cmdTempDeck.get()));
#else
DeckDataWrapper * myCommandZone = NEW DeckDataWrapper(cmdTempDeck);
#endif
MTGCard * commander = myCommandZone->getCard(0, true); MTGCard * commander = myCommandZone->getCard(0, true);
while(!commander->data->isCreature()) while(!commander->data->isCreature())
{ {
cmdTempDeck->addRandomCards(1, 0, 0, -1, "legendary"); cmdTempDeck->addRandomCards(1, 0, 0, -1, "legendary");
#if !defined (PSP)
myCommandZone.reset(new DeckDataWrapper(cmdTempDeck.get())); myCommandZone.reset(new DeckDataWrapper(cmdTempDeck.get()));
#else
myCommandZone = NEW DeckDataWrapper(cmdTempDeck);
#endif
commander = myCommandZone->getCard(0, true); commander = myCommandZone->getCard(0, true);
} }
@@ -468,6 +481,7 @@ Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI)
string deckFile = "random"; string deckFile = "random";
string deckFileSmall = "random"; string deckFileSmall = "random";
#if !defined (PSP)
std::unique_ptr<Player> player; std::unique_ptr<Player> player;
if (!isAI) // Human Player if (!isAI) // Human Player
player.reset(new HumanPlayer(observer, deckFile, deckFileSmall, false, tempDeck.release())); player.reset(new HumanPlayer(observer, deckFile, deckFileSmall, false, tempDeck.release()));
@@ -475,6 +489,15 @@ Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI)
player.reset(new AIPlayerBaka(observer, deckFile, deckFileSmall, "", tempDeck.release())); player.reset(new AIPlayerBaka(observer, deckFile, deckFileSmall, "", tempDeck.release()));
return player.release(); return player.release();
#else
Player *player = NULL;
if (!isAI) // Human Player
player = NEW HumanPlayer(observer, deckFile, deckFileSmall, false, tempDeck);
else
player = NEW AIPlayerBaka(observer, deckFile, deckFileSmall, "", tempDeck);
return player;
#endif
} }
Player * Rules::loadPlayerHorde(GameObserver* observer, int isAI) Player * Rules::loadPlayerHorde(GameObserver* observer, int isAI)