Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv837/rails/game
Modified Files:
OperatingRound.java GameManager.java
Log Message:
OR start changed: all floated companies will run, even if the start package has not been sold yet (as can happen in 1835).
Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** OperatingRound.java 5 Mar 2010 20:49:41 -0000 1.113
--- OperatingRound.java 6 Mar 2010 18:28:41 -0000 1.114
***************
*** 12,16 ****
import rails.game.state.EnumState;
import rails.game.state.IntegerState;
- //import rails.game.state.GenericState;
import rails.util.LocalText;
--- 12,15 ----
***************
*** 104,108 ****
}
! public void start(boolean operate) {
thisOrNumber = gameManager.getORId();
--- 103,107 ----
}
! public void start() {
thisOrNumber = gameManager.getORId();
***************
*** 127,131 ****
}
! if (operate) {
StringBuilder msg = new StringBuilder();
--- 126,130 ----
}
! if (operatingCompanyArray.length > 0) {
StringBuilder msg = new StringBuilder();
***************
*** 141,152 ****
}
! if (operatingCompanyArray.length > 0) {
!
! if (setNextOperatingCompany(true)){
! setStep(GameDef.OrStep.INITIAL);
! return;
! }
}
!
}
--- 140,147 ----
}
! if (setNextOperatingCompany(true)){
! setStep(GameDef.OrStep.INITIAL);
}
! return;
}
Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** GameManager.java 3 Mar 2010 00:45:06 -0000 1.85
--- GameManager.java 6 Mar 2010 18:28:41 -0000 1.86
***************
*** 606,610 ****
OperatingRound or = createRound(operatingRoundClass);
if (operate) absoluteORNumber.add(1);
! or.start(operate);
}
--- 606,610 ----
OperatingRound or = createRound(operatingRoundClass);
if (operate) absoluteORNumber.add(1);
! or.start();
}
|
