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

- various compilations fixes for Symbian

Browse Source 
- small cleanups of the TestSuite and Player classes
This commit is contained in:
Xawotihs
2011-09-19 19:49:45 +00:00
parent 180462f73c
commit bb65d2dc12
9 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/mtg/src/GameObserver.cpp
View File

@@ -112,7 +112,6 @@ void GameObserver::nextGamePhase()
cleanupPhase();
currentPlayer->damageCount = 0;
currentPlayer->preventable = 0;
currentPlayer->isPoisoned = false;
mLayers->actionLayer()->cleanGarbage(); //clean abilities history for this turn;
mLayers->stackLayer()->garbageCollect(); //clean stack history for this turn;
mLayers->actionLayer()->Update(0);
@@ -371,8 +370,6 @@ void GameObserver::gameStateBasedEffects()
{
if(getCurrentTargetChooser() && int(getCurrentTargetChooser()->targets.size()) == getCurrentTargetChooser()->maxtargets)
getCurrentTargetChooser()->done = true;
for (int i = 0; i < 2; i++)
players[i]->isPoisoned = (players[i]->poisonCount > 0);
if (mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0)
return;
if (mLayers->actionLayer()->menuObject)