github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-12 09:11:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Issue#36: End combat icon will not be shifted to left if it's the current phase

Browse source
This commit is contained in:
magenoxx 2012-08-16 01:07:01 +04:00
parent be15858fd0
commit b229fafcf9
1 changed files with 2 additions and 1 deletions

3
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -406,6 +406,7 @@ public class GamePanel extends javax.swing.JPanel {
} else {
this.txtPhase.setText("");
}
updatePhases(game.getStep());
if (game.getPhase() != null && game.getPhase().toString().equals("End") && game.getStep().toString().equals("End Turn")) {
//AudioManager.playEndTurn();
}
@ -451,7 +452,6 @@ public class GamePanel extends javax.swing.JPanel {
//combat.hideDialog();
CombatManager.getInstance().hideCombat(gameId);
}
updatePhases(game.getStep());
this.revalidate();
this.repaint();
}
@ -503,6 +503,7 @@ public class GamePanel extends javax.swing.JPanel {
case DECLARE_BLOCKERS: updateButton("Combat_Block"); break;
case FIRST_COMBAT_DAMAGE:
case COMBAT_DAMAGE: updateButton("Combat_Damage"); break;
case END_COMBAT: updateButton("Combat_End"); break;
case POSTCOMBAT_MAIN: updateButton("Main2"); break;
case END_TURN: updateButton("Cleanup"); break;
}