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

Merge branch 'master' of https://github.com/WagicProject/wagic into cmake

Browse Source
This commit is contained in:
xawotihs
2017-09-02 21:15:47 +02:00
parent 2b342ca33b 07e6d90c98
commit 15111d1b20
541 changed files with 95355 additions and 35840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/TestSuiteAI.cpp
+7 -2
View File
@@ -8,6 +8,9 @@
#include "Rules.h"
#include "GameObserver.h"
#include "GameStateShop.h"
#ifdef QT_CONFIG
#include <QThread>
#endif
#ifdef QT_CONFIG
#include <QThread>
@@ -874,7 +877,8 @@ void TestSuiteGame::initGame()
{
if (zone == p->game->inPlay)
{
MTGCardInstance * copy = p->game->putInZone(card, p->game->library, p->game->stack);
//MTGCardInstance * copy = p->game->putInZone(card, p->game->library, p->game->stack);
MTGCardInstance * copy = zone->owner->game->putInZone(card, p->game->library, p->game->stack);
Spell * spell = NEW Spell(observer, copy);
spell->resolve();
if (!summoningSickness && (size_t)p->game->inPlay->nb_cards > k) p->game->inPlay->cards[k]->summoningSickness = 0;
@@ -886,7 +890,8 @@ void TestSuiteGame::initGame()
{
LOG ("TESTUITE ERROR, CARD NOT FOUND IN LIBRARY\n");
}
p->game->putInZone(card, p->game->library, zone);
//p->game->putInZone(card, p->game->library, zone);
zone->owner->game->putInZone(card, p->game->library, zone);
}
}
else