Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21549/rails/game
Modified Files:
PhaseManager.java Phase.java
Log Message:
Added phase and train info to the status window
Index: PhaseManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PhaseManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PhaseManager.java 31 Oct 2009 17:08:26 -0000 1.18
--- PhaseManager.java 18 Jan 2010 18:46:57 -0000 1.19
***************
*** 87,89 ****
--- 87,93 ----
}
+ public List<Phase> getPhases() {
+ return phaseList;
+ }
+
}
Index: Phase.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Phase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Phase.java 31 Oct 2009 17:08:27 -0000 1.14
--- Phase.java 18 Jan 2010 18:47:16 -0000 1.15
***************
*** 33,37 ****
/** May company buy more than one Train of each type from the Bank per turn? */
protected boolean oneTrainPerTypePerTurn = false;
!
/** Is loan taking allowed */
protected boolean loanTakingAllowed = false;
--- 33,37 ----
/** May company buy more than one Train of each type from the Bank per turn? */
protected boolean oneTrainPerTypePerTurn = false;
!
/** Is loan taking allowed */
protected boolean loanTakingAllowed = false;
***************
*** 126,134 ****
oneTrainPerTypePerTurn);
}
!
Tag loansTag = tag.getChild("Loans");
if (loansTag != null) {
loanTakingAllowed = loansTag.getAttributeAsBoolean("allowed",
! loanTakingAllowed);
}
--- 126,134 ----
oneTrainPerTypePerTurn);
}
!
Tag loansTag = tag.getChild("Loans");
if (loansTag != null) {
loanTakingAllowed = loansTag.getAttributeAsBoolean("allowed",
! loanTakingAllowed);
}
***************
*** 164,167 ****
--- 164,171 ----
}
+ public String getTileColoursString() {
+ return colourList;
+ }
+
public int getIndex() {
return index;
|
