Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5954/rails/game
Modified Files:
OperatingRound.java
Log Message:
Moved stepObject creation backwards to OR start()
Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** OperatingRound.java 27 Nov 2009 20:35:18 -0000 1.81
--- OperatingRound.java 20 Dec 2009 14:57:02 -0000 1.82
***************
*** 164,167 ****
--- 164,172 ----
log.info("Initial operating sequence is "+msg.toString());
+ if (stepObject == null) {
+ stepObject = new IntegerState("ORStep", -1);
+ stepObject.addObserver(this);
+ }
+
if (operatingCompanyArray.length > 0) {
***************
*** 1912,1919 ****
if (step == STEP_INITIAL) initTurn();
- if (stepObject == null) {
- stepObject = new IntegerState("ORStep", -1);
- stepObject.addObserver(this);
- }
stepObject.set(step);
--- 1917,1920 ----
|