[Rails-commits] SF.net SVN: rails:[1490] trunk/18xx

[<ev...@us...>]

Revision: 1490
          http://rails.svn.sourceforge.net/rails/?rev=1490&view=rev
Author:   evos
Date:     2011-02-24 21:37:04 +0000 (Thu, 24 Feb 2011)

Log Message:
-----------
Fixed in 1856: CGR could payout from a 4-train. It must withhold.

Modified Paths:
--------------
    trunk/18xx/LocalisedText.properties
    trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java

Modified: trunk/18xx/LocalisedText.properties
===================================================================
--- trunk/18xx/LocalisedText.properties	2011-02-20 23:37:32 UTC (rev 1489)
+++ trunk/18xx/LocalisedText.properties	2011-02-24 21:37:04 UTC (rev 1490)
@@ -380,6 +380,7 @@
 MustBuyExtraShareAsPresident={0} must buy an extra {1} {2}% share to obtain the President's certificate
 MustBuyTrainIfNoRoute=You must buy a train unless you have no route
 MustRepayLoans={0} must repay {1} loans of {2} for {3}
+MustWithholdUntilPermanent={0} must withhold revenue until it owns a permanent train
 NamesTrain={0} names {1}-train as {2}
 NegativeAmountNotAllowed=Negative amount {0} not allowed
 NetworkInfo=Network Info

Modified: trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java
===================================================================
--- trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java	2011-02-20 23:37:32 UTC (rev 1489)
+++ trunk/18xx/rails/game/specific/_1856/OperatingRound_1856.java	2011-02-24 21:37:04 UTC (rev 1490)
@@ -105,14 +105,14 @@
         if (operatingCompany.get().canRunTrains()) {
 
             if (operatingCompany.get() instanceof PublicCompany_CGR
-                    && ((PublicCompany_CGR)operatingCompany.get()).runsWithBorrowedTrain()) {
-                DisplayBuffer.add(LocalText.getText("RunsWithBorrowedTrain",
-                        PublicCompany_CGR.NAME, "D"));
-                possibleActions.add(new SetDividend(
-                        operatingCompany.get().getLastRevenue(), true,
-                        new int[] {SetDividend.WITHHOLD }));
+                        && !((PublicCompany_CGR)operatingCompany.get()).hadPermanentTrain()) {
+                    DisplayBuffer.add(LocalText.getText("MustWithholdUntilPermanent",
+                            PublicCompany_CGR.NAME));
+                    possibleActions.add(new SetDividend(
+                            operatingCompany.get().getLastRevenue(), true,
+                            new int[] {SetDividend.WITHHOLD }));
             } else {
-
+                
                 int[] allowedRevenueActions =
                         operatingCompany.get().isSplitAlways()
                                 ? new int[] { SetDividend.SPLIT }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.