Show Undo in prompt if last action is undoable

Clean up unnecessary items from Game menu
This commit is contained in:
drdev
2014-07-01 04:46:24 +00:00
parent e32f335010
commit b51b67e6f0
9 changed files with 59 additions and 42 deletions

View File

@@ -21,7 +21,6 @@ import com.google.common.collect.Lists;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import forge.GuiBase;
import forge.LobbyPlayer;
import forge.UiCommand;
import forge.FThreads;
@@ -31,7 +30,6 @@ import forge.events.IUiEventVisitor;
import forge.events.UiEvent;
import forge.events.UiEventAttackerDeclared;
import forge.events.UiEventBlockerAssigned;
import forge.game.Game;
import forge.game.GameEntity;
import forge.game.card.Card;
import forge.game.combat.Combat;
@@ -477,15 +475,6 @@ public enum CMatchUI implements ICDoc, IMenuProvider {
}
return panels;
}
/** Undo last game action if possible. */
public void undo() {
Game game = Singletons.getControl().getObservedGame();
Player player = game.getPhaseHandler().getPriorityPlayer();
if (player != null && player.getLobbyPlayer() == GuiBase.getInterface().getGuiPlayer()) {
game.stack.undo();
}
}
/** Concede game, bring up WinLose UI. */
public void concede() {

View File

@@ -1,6 +1,7 @@
package forge.screens.match.menus;
import forge.assets.FSkinProp;
import forge.match.MatchUtil;
import forge.menus.MenuUtil;
import forge.model.FModel;
import forge.properties.ForgePreferences;
@@ -75,7 +76,7 @@ public final class GameMenu {
return new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
CMatchUI.SINGLETON_INSTANCE.undo();
MatchUtil.undoLastAction();
}
};
}