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

Fix players vector (had a couple of 4 players game with the new code), added more cleanup

Browse Source
This commit is contained in:
Xawotihs
2011-10-01 23:49:37 +00:00
parent 76a8f406ec
commit 483c767492
8 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -264,7 +264,7 @@ void GameStateDuel::loadTestSuitePlayers()
{
mPlayers.push_back(new TestSuiteAI(game, testSuite, i));
}
game->setPlayers(mPlayers, 2);
game->setPlayers(mPlayers);
mParent->gameType = testSuite->gameType;
game->startGame(mParent->rules);
@@ -446,20 +446,20 @@ void GameStateDuel::Update(float dt)
case DUEL_STATE_PLAY:
if (!game)
{
game = new GameObserver(mPlayers, 2);
game = new GameObserver(mPlayers);
game->startGame(mParent->rules);
if (mParent->gameType == GAME_TYPE_MOMIR)
{
game->addObserver(NEW MTGMomirRule(game, -1, MTGCollection()));
}
if (mParent->gameType == GAME_TYPE_STONEHEWER)
{
game->addObserver(NEW MTGStoneHewerRule(game, -1,MTGCollection()));
}
if (mParent->gameType == GAME_TYPE_HERMIT)
{
game->addObserver(NEW MTGHermitRule(game, -1));
}
if (mParent->gameType == GAME_TYPE_STONEHEWER)
{
game->addObserver(NEW MTGStoneHewerRule(game, -1,MTGCollection()));
}
if (mParent->gameType == GAME_TYPE_HERMIT)
{
game->addObserver(NEW MTGHermitRule(game, -1));
}
//start of in game music code
musictrack = "";