jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 08:14:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixed conflicts

Browse source
This commit is contained in:
Matt Lowe 2015-05-22 11:51:10 +02:00
parent d1b243481b
commit 4c1e24c214
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/messagelogwidget.cpp
View file

@ -803,8 +803,8 @@ void MessageLogWidget::logSetActivePhase(int phase)
case 1: phaseName = tr("upkeep step"); break;
case 2: phaseName = tr("draw step"); break;
case 3: phaseName = tr("first main phase"); break;
case 4: phaseName = tr("beginning of combat step"); soundEngine->startCombat(); break;
case 5: phaseName = tr("declare attackers step"); break;
case 4: phaseName = tr("beginning of combat step"); break;
case 5: phaseName = tr("declare attackers step"); soundEngine->attack(); break;
case 6: phaseName = tr("declare blockers step"); break;
case 7: phaseName = tr("combat damage step"); break;
case 8: phaseName = tr("end of combat step"); break;