Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

New way for displaying combat

Browse source
This commit is contained in:
magenoxx 2012-06-17 13:13:51 +04:00
parent 77ecea1253
commit 0c785abb46
7 changed files with 198 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import mage.Constants;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
import mage.client.chat.ChatPanel;
import mage.client.combat.CombatManager;
import mage.client.components.MageComponents;
import mage.client.components.ext.dlg.DialogManager;
import mage.client.dialog.*;
@ -421,9 +422,11 @@ public class GamePanel extends javax.swing.JPanel {
showRevealed(game);
showLookedAt(game);
if (game.getCombat().size() > 0) {
combat.showDialog(game.getCombat());
//combat.showDialog(game.getCombat());
CombatManager.getInstance().showCombat(game.getCombat(), gameId);
} else {
combat.hideDialog();
//combat.hideDialog();
CombatManager.getInstance().hideCombat();
}
updatePhases(game.getStep());
this.revalidate();