external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged changes from trunk to GuiRefactoring: 27198-27235

Browse Source
This commit is contained in:
elcnesh
2014-09-07 09:27:46 +00:00
parent c931379ce8
commit 5925c35486
33 changed files with 742 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDock.java
View File

@@ -61,10 +61,7 @@ public enum CDock implements ICDoc {
* End turn.
*/
public void endTurn() {
game.autoPassUntilEndOfTurn();
if (!CPrompt.SINGLETON_INSTANCE.passPriority()) {
game.autoPassCancel();
}
CPrompt.SINGLETON_INSTANCE.passPriorityUntilEndOfTurn();
}
public void revertLayout() {

4
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
View File

@@ -101,6 +101,10 @@ public enum CPrompt implements ICDoc {
return Singletons.getControl().getGameView().passPriority();
}
public boolean passPriorityUntilEndOfTurn() {
return Singletons.getControl().getGameView().passPriorityUntilEndOfTurn();
}
public void selectPlayer(final PlayerView player, final ITriggerEvent triggerEvent) {
Singletons.getControl().getGameView().selectPlayer(player, triggerEvent);
}