Merge branch 'master' into minmax

2013-11-30 23:10:24 +01:00
parent a683f5a2b7 9effa7c975
commit 261a6e4780
114 changed files with 1110 additions and 973 deletions
@@ -110,12 +110,12 @@ GamePhase GameObserver::getCurrentGamePhase()
    return mCurrentGamePhase;
 }

-const char* GameObserver::getCurrentGamePhaseName()
+const string& GameObserver::getCurrentGamePhaseName()
 {
    return phaseRing->phaseName(mCurrentGamePhase);
 }

-const char* GameObserver::getNextGamePhaseName()
+const string& GameObserver::getNextGamePhaseName()
 {
    return phaseRing->phaseName((mCurrentGamePhase + 1) % MTG_PHASE_CLEANUP);
 }
@@ -1042,7 +1042,7 @@ void GameObserver::Affinity()
                    }
                    else
                    {
-                        reduce = card->controller()->game->battlefield->countByType(type.c_str());
+                        reduce = card->controller()->game->battlefield->countByType(type);
                    }
                    for(int i = 0; i < reduce;i++)
                    {