Update of /cvsroot/rails/18xx/rails/game/specific/_1835
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30360/rails/game/specific/_1835
Modified Files:
PrussianFormationRound.java
Log Message:
Chech Prussian presidency after each formation round
Index: PrussianFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/PrussianFormationRound.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PrussianFormationRound.java 15 Apr 2010 19:49:50 -0000 1.10
--- PrussianFormationRound.java 18 Apr 2010 20:52:32 -0000 1.11
***************
*** 300,304 ****
if (!hex.hasTokenOfCompany(prussian) && hex.layBaseToken(prussian, city.getNumber())) {
/* TODO: the false return value must be impossible. */
! message =LocalText.getText("ExchangesBaseToken",
PR_ID, minor.getName(),
city.getName());
--- 300,304 ----
if (!hex.hasTokenOfCompany(prussian) && hex.layBaseToken(prussian, city.getNumber())) {
/* TODO: the false return value must be impossible. */
! message = LocalText.getText("ExchangesBaseToken",
PR_ID, minor.getName(),
city.getName());
***************
*** 346,349 ****
--- 346,353 ----
}
+ protected void finishRound() {
+ if (prussian.hasStarted()) prussian.checkPresidency();
+ super.finishRound();
+ }
public static boolean prussianIsComplete(GameManagerI gameManager) {
***************
*** 354,362 ****
}
return true;
- /*
- List<PublicCertificateI> unissued
- = gameManager.getBank().getUnavailable().getCertificatesPerCompany(PR_ID);
- return unissued == null || unissued.isEmpty();
- */
}
--- 358,361 ----
|
