Substitute more char arrays with strings

2013-11-23 12:57:31 +01:00
parent 3f0dd987f0
commit 9ee44ca091
22 changed files with 61 additions and 50 deletions
--- a/projects/mtg/src/PhaseRing.cpp
+++ b/projects/mtg/src/PhaseRing.cpp
@@ -142,9 +142,10 @@ bool PhaseRing::extraDamagePhase(int id)
    return false;
 }

-const char * PhaseRing::phaseName(int id)
+const string& PhaseRing::phaseName(int id)
 {
-    if (extraDamagePhase(id)) return "Combat Damage (2)";
+    static const string combatPhase2("Combat Damage (2)");
+    if (extraDamagePhase(id)) return combatPhase2;
    return Constants::MTGPhaseNames[id];
 }