Update of /cvsroot/rails/18xx/rails/game/specific/_18EU
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22505/rails/game/specific/_18EU
Modified Files:
GameManager_18EU.java OperatingRound_18EU.java
Log Message:
Moved FMER start player from OR to GM object, as it must survive an OR change.
Index: GameManager_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/GameManager_18EU.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GameManager_18EU.java 23 Dec 2008 20:02:18 -0000 1.4
--- GameManager_18EU.java 18 Jan 2010 22:51:47 -0000 1.5
***************
*** 5,8 ****
--- 5,9 ----
import rails.game.Player;
import rails.game.RoundI;
+ import rails.game.state.State;
/**
***************
*** 12,27 ****
public class GameManager_18EU extends GameManager {
! private Player playerToStartFMERound = null;
@Override
public void nextRound(RoundI round) {
if (round instanceof OperatingRound_18EU) {
! if (((OperatingRound_18EU) round).getPlayerToStartExchangeRound() != null) {
! playerToStartFMERound = ((OperatingRound_18EU) round).getPlayerToStartExchangeRound();
! }
! if (playerToStartFMERound != null
&& relativeORNumber.intValue() == numOfORs) {
! createRound (FinalMinorExchangeRound.class).start (playerToStartFMERound);
! playerToStartFMERound = null;
} else {
super.nextRound(round);
--- 13,27 ----
public class GameManager_18EU extends GameManager {
! protected State playerToStartFMERound =
! new State("playerToStartFMERound", Player.class);
@Override
public void nextRound(RoundI round) {
if (round instanceof OperatingRound_18EU) {
! if (playerToStartFMERound.getObject() != null
&& relativeORNumber.intValue() == numOfORs) {
! createRound (FinalMinorExchangeRound.class).start
! ((Player)playerToStartFMERound.getObject());
! playerToStartFMERound.set(null);
} else {
super.nextRound(round);
***************
*** 35,37 ****
--- 35,47 ----
}
+ public void setPlayerToStartFMERound(Player playerToStartFMERound) {
+ this.playerToStartFMERound.set(playerToStartFMERound);
+ }
+
+ public Player getPlayerToStartFMERound() {
+ return (Player) playerToStartFMERound.getObject();
+ }
+
+
+
}
Index: OperatingRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OperatingRound_18EU.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OperatingRound_18EU.java 14 Jan 2010 20:55:13 -0000 1.10
--- OperatingRound_18EU.java 18 Jan 2010 22:51:47 -0000 1.11
***************
*** 21,27 ****
new BooleanState("ORCompanyHasPullmannAtStart", false);
- protected State playerToStartExchangeRound =
- new State("PlayerToStartExchangeRound", Player.class);
-
public OperatingRound_18EU (GameManagerI gameManager) {
super (gameManager);
--- 21,24 ----
***************
*** 181,186 ****
if (result && gameManager.getPhaseManager().hasReachedPhase("5")
&& operatingCompanyArray[0].getTypeName().equals("Minor")
! && playerToStartExchangeRound.getObject() == null) {
! playerToStartExchangeRound.set(operatingCompany.getPresident());
}
--- 178,183 ----
if (result && gameManager.getPhaseManager().hasReachedPhase("5")
&& operatingCompanyArray[0].getTypeName().equals("Minor")
! && ((GameManager_18EU)gameManager).getPlayerToStartFMERound() == null) {
! ((GameManager_18EU)gameManager).setPlayerToStartFMERound(operatingCompany.getPresident());
}
***************
*** 228,234 ****
}
- public Player getPlayerToStartExchangeRound() {
- return (Player) playerToStartExchangeRound.getObject();
- }
-
}
--- 225,227 ----
|
