github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Some spelling changes.

Browse source
This commit is contained in:
LevelX2 2015-07-26 09:19:46 +02:00
parent 25db567c89
commit 768fd17d93
4 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
View file

@ -333,7 +333,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
} }
}; };
JMenu rollbackMainItem = new JMenu("Roll back"); JMenu rollbackMainItem = new JMenu("Rollback");
rollbackMainItem.setMnemonic(KeyEvent.VK_R); rollbackMainItem.setMnemonic(KeyEvent.VK_R);
rollbackMainItem.setToolTipText("The game will be rolled back to the start of the requested turn if all players agree."); rollbackMainItem.setToolTipText("The game will be rolled back to the start of the requested turn if all players agree.");
popupMenu.add(rollbackMainItem); popupMenu.add(rollbackMainItem);

63
Mage.Client/src/main/java/mage/client/game/PlayAreaPanelOptions.java
View file

@ -1,30 +1,30 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.client.game; package mage.client.game;
/** /**
@ -39,20 +39,21 @@ public class PlayAreaPanelOptions {
this.playerItself = playerItself; this.playerItself = playerItself;
this.rollbackTurnsAllowed = rollbackTurnsAllowed; this.rollbackTurnsAllowed = rollbackTurnsAllowed;
} }
/** /**
* true if the client is a player / false if the client is a watcher * true if the client is a player / false if the client is a watcher
*/ */
public boolean isPlayer = false; public boolean isPlayer = false;
/** /**
* true if the player is the client player itself, false if the player is another player playing with the clinet player * true if the player is the client player itself, false if the player is
* another player playing with the clinet player
*/ */
public boolean playerItself = false; public boolean playerItself = false;
/** /**
* true if the player can roll back turns if all players agree * true if the player can rollback turns if all players agree
*/ */
public boolean rollbackTurnsAllowed = false; public boolean rollbackTurnsAllowed = false;
} }

2
Mage/src/mage/game/GameImpl.java
View file

@ -174,7 +174,7 @@ public abstract class GameImpl implements Game, Serializable {
protected GameState state; protected GameState state;
private transient Stack<Integer> savedStates = new Stack<>(); private transient Stack<Integer> savedStates = new Stack<>();
protected transient GameStates gameStates = new GameStates(); protected transient GameStates gameStates = new GameStates();
// game states to allow player roll back // game states to allow player rollback
protected transient Map<Integer, GameState> gameStatesRollBack = new HashMap<>(); protected transient Map<Integer, GameState> gameStatesRollBack = new HashMap<>();
protected boolean executingRollback; protected boolean executingRollback;

12
Mage/src/mage/game/GameOptions.java
View file

@ -4,8 +4,8 @@ import java.io.Serializable;
import mage.constants.PhaseStep; import mage.constants.PhaseStep;
/** /**
* Game options for Mage game. * Game options for Mage game. Mainly used in tests to configure
* Mainly used in tests to configure {@link GameImpl} with specific params. * {@link GameImpl} with specific params.
* *
* @author ayratn * @author ayratn
*/ */
@ -23,8 +23,8 @@ public class GameOptions implements Serializable {
public boolean testMode = false; public boolean testMode = false;
/** /**
* Defines the turn number game should stop on. * Defines the turn number game should stop on. By default, is null meaning
* By default, is null meaning that game shouldn't stop on any specific turn. * that game shouldn't stop on any specific turn.
*/ */
public Integer stopOnTurn = null; public Integer stopOnTurn = null;
@ -37,9 +37,9 @@ public class GameOptions implements Serializable {
* If true, library won't be shuffled at the beginning of the game * If true, library won't be shuffled at the beginning of the game
*/ */
public boolean skipInitShuffling = false; public boolean skipInitShuffling = false;
/** /**
* If true, players can roll back turn if all players agree * If true, players can rollback turn if all players agree
*/ */
public boolean rollbackTurnsAllowed = true; public boolean rollbackTurnsAllowed = true;
} }