data/1835/Tiles.xml | 1 -
rails/game/specific/_1835/GameManager_1835.java | 1 +
rails/game/specific/_1835/OperatingRound_1835.java | 5 ++++-
tiles/TileDictionary.18t | 4 ----
tiles/TileDictionary.xml | 5 -----
tiles/Tiles.xml | 1 -
6 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 436879f40b9571dfcb27ef5340232a1ec8410aff
Author: Erik Vos <eri...@xs...>
Date: Fri Oct 12 22:09:41 2012 +0200
1835: after resuming an OR after a PR formation round, a check was missing if the (minor) operating company still exists. Fix: finish the turn if the operating company is closed at that point.
This has happened on buying the first 5-train by a minor company.
Reported by Volker Schnell.
Also fixed: a redundant (and harmless) null track in tile -114 (Braunschweig).
diff --git a/data/1835/Tiles.xml b/data/1835/Tiles.xml
index f2e99d8..9d048be 100644
--- a/data/1835/Tiles.xml
+++ b/data/1835/Tiles.xml
@@ -42,7 +42,6 @@
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side1"/>
- <Track from="side2" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-143" name="-143">
<Station id="city1" position="0" type="Town" value="10"/>
diff --git a/rails/game/specific/_1835/GameManager_1835.java b/rails/game/specific/_1835/GameManager_1835.java
index 8a44dca..28593b6 100644
--- a/rails/game/specific/_1835/GameManager_1835.java
+++ b/rails/game/specific/_1835/GameManager_1835.java
@@ -9,6 +9,7 @@ public class GameManager_1835 extends GameManager {
private RoundI previousRound = null;
private Player prFormStartingPlayer = null;
+ public static String M1_ID = "M1";
public static String M2_ID = "M2";
public static String PR_ID = "PR";
public static String OL_ID = "OL";
diff --git a/rails/game/specific/_1835/OperatingRound_1835.java b/rails/game/specific/_1835/OperatingRound_1835.java
index 4513f32..3546ffd 100644
--- a/rails/game/specific/_1835/OperatingRound_1835.java
+++ b/rails/game/specific/_1835/OperatingRound_1835.java
@@ -147,7 +147,7 @@ public class OperatingRound_1835 extends OperatingRound {
// PR has just started. Check if it can operate this round
// That's only the case if M1 has just bought
// the first 4-train or 4+4-train
- && operatingCompany.get() == companyManager.getPublicCompany("M1")) {
+ && operatingCompany.getName().equalsIgnoreCase(GameManager_1835.M1_ID)) {
log.debug("M2 has not operated: PR can operate");
// Insert the Prussian before the first major company
@@ -179,6 +179,9 @@ public class OperatingRound_1835 extends OperatingRound {
}
+ // Check if the operating company still exists
+ if (operatingCompany.get().isClosed()) finishTurn();
+
guiHints.setCurrentRoundType(getClass());
super.resume();
}
diff --git a/tiles/TileDictionary.18t b/tiles/TileDictionary.18t
index e42ad39..366d1dc 100644
--- a/tiles/TileDictionary.18t
+++ b/tiles/TileDictionary.18t
@@ -12970,10 +12970,6 @@ object TTilesWrapper
item
Position1 = tp1SideF
Position2 = tp4SideB
- end
- item
- Position1 = tp4SideC
- Position2 = tp4SideC
end>
Junctions = <
item
diff --git a/tiles/TileDictionary.xml b/tiles/TileDictionary.xml
index 56a6e39..a1bbe64 100644
--- a/tiles/TileDictionary.xml
+++ b/tiles/TileDictionary.xml
@@ -17779,11 +17779,6 @@
<position1>tp1SideF</position1>
<position2>tp4SideB</position2>
</connection>
- <connection>
- <conType>ctNormal</conType>
- <position1>tp4SideC</position1>
- <position2>tp4SideC</position2>
- </connection>
</connections>
</tile>
<tile>
diff --git a/tiles/Tiles.xml b/tiles/Tiles.xml
index 9e879bc..49d95d6 100644
--- a/tiles/Tiles.xml
+++ b/tiles/Tiles.xml
@@ -3126,7 +3126,6 @@
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side1"/>
- <Track from="side2" gauge="normal" to="side2"/>
</Tile>
<Tile colour="yellow" id="-807" name="XX">
<Station id="city1" position="102" slots="1" type="City"/>
|
