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

Removed useless attribute

Browse Source
This commit is contained in:
Xawotihs
2011-01-28 17:34:49 +00:00
parent 5e651f03b2
commit cba0a59023
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/GameStateDuel.h
-1
View File
@@ -26,7 +26,6 @@ private:
int mGamePhase; int mGamePhase;
Player * mCurrentPlayer; Player * mCurrentPlayer;
Player * mPlayers[2]; Player * mPlayers[2];
MTGPlayerCards * deck[2];
GameObserver * game; GameObserver * game;
DeckMenu * deckmenu; DeckMenu * deckmenu;
DeckMenu * opponentMenu; DeckMenu * opponentMenu;
projects/mtg/src/GameStateDuel.cpp
-6
View File
@@ -61,7 +61,6 @@ GameState(parent)
{ {
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
deck[i] = NULL;
mPlayers[i] = NULL; mPlayers[i] = NULL;
} }
premadeDeck = false; premadeDeck = false;
@@ -173,7 +172,6 @@ void GameStateDuel::loadPlayer(int playerId, int decknb, int isAI)
MTGDeck * tempDeck = NEW MTGDeck(deckFile, mParent->collection); MTGDeck * tempDeck = NEW MTGDeck(deckFile, mParent->collection);
mPlayers[playerId] = NEW HumanPlayer(tempDeck, deckFile, deckFileSmall); mPlayers[playerId] = NEW HumanPlayer(tempDeck, deckFile, deckFileSmall);
deck[playerId] = mPlayers[playerId]->game;
delete tempDeck; delete tempDeck;
} }
else else
@@ -182,7 +180,6 @@ void GameStateDuel::loadPlayer(int playerId, int decknb, int isAI)
Player * opponent = NULL; Player * opponent = NULL;
if (playerId == 1) opponent = mPlayers[0]; if (playerId == 1) opponent = mPlayers[0];
mPlayers[playerId] = playerCreator.createAIPlayer(mParent->collection, opponent, decknb); mPlayers[playerId] = playerCreator.createAIPlayer(mParent->collection, opponent, decknb);
deck[playerId] = mPlayers[playerId]->game;
} }
} }
else else
@@ -191,7 +188,6 @@ void GameStateDuel::loadPlayer(int playerId, int decknb, int isAI)
Player * opponent = NULL; Player * opponent = NULL;
if (playerId == 1) opponent = mPlayers[0]; if (playerId == 1) opponent = mPlayers[0];
mPlayers[playerId] = playerCreator.createAIPlayer(mParent->collection, opponent); mPlayers[playerId] = playerCreator.createAIPlayer(mParent->collection, opponent);
deck[playerId] = mPlayers[playerId]->game;
} }
} }
@@ -210,7 +206,6 @@ void GameStateDuel::loadTestSuitePlayers()
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
mPlayers[i] = NEW TestSuiteAI(testSuite, i); mPlayers[i] = NEW TestSuiteAI(testSuite, i);
deck[i] = mPlayers[i]->game;
} }
mParent->gameType = testSuite->gameType; mParent->gameType = testSuite->gameType;
@@ -243,7 +238,6 @@ void GameStateDuel::End()
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
mPlayers[i] = NULL; mPlayers[i] = NULL;
deck[i] = NULL;
} }
SAFE_DELETE(credits); SAFE_DELETE(credits);
SAFE_DELETE(rules); SAFE_DELETE(rules);