epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9634 from pchote/fix-bridge-huts

Browse Source 
Fix bridge destruction and repair.
This commit is contained in:
abcdefg30
2015-10-17 23:51:14 +02:00
parent bc9abdb3db 8d0d789e40
commit 4daf22e759
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Buildings/Bridge.cs
View File

@@ -152,6 +152,7 @@ namespace OpenRA.Mods.Common.Traits
internal void AddHut(BridgeHut hut) internal void AddHut(BridgeHut hut)
{ {
// TODO: This method is incomprehensible and fragile, and should be rewritten.
if (huts[0] == huts[1]) if (huts[0] == huts[1])
huts[1] = hut; huts[1] = hut;
if (Hut == null) if (Hut == null)
@@ -161,7 +162,7 @@ namespace OpenRA.Mods.Common.Traits
huts[0] = hut; // Set only first time huts[0] = hut; // Set only first time
for (var d = 0; d <= 1; d++) for (var d = 0; d <= 1; d++)
for (var b = neighbours[d]; b != null; b = b.Hut == null ? b.neighbours[d] : null) for (var b = neighbours[d]; b != null; b = b.Hut == null ? b.neighbours[d] : null)
b.huts[1 - d] = hut; b.huts[d] = hut;
} }
else else
Hut = null; Hut = null;

10
mods/ra/rules/civilian.yaml
View File

@@ -493,8 +493,9 @@ BRIDGEHUT:
Building: Building:
Footprint: __ __ Footprint: __ __
Dimensions: 2,2 Dimensions: 2,2
CustomSelectionSize: Selectable:
CustomBounds: 48,48 Bounds: 48,48
Priority: 2
BridgeHut: BridgeHut:
Targetable: Targetable:
TargetTypes: BridgeHut, C4 TargetTypes: BridgeHut, C4
@@ -504,8 +505,9 @@ BRIDGEHUT.small:
Building: Building:
Footprint: _ Footprint: _
Dimensions: 1,1 Dimensions: 1,1
CustomSelectionSize: Selectable:
CustomBounds: 24,24 Bounds: 24,24
Priority: 2
BridgeHut: BridgeHut:
Targetable: Targetable:
TargetTypes: BridgeHut, C4 TargetTypes: BridgeHut, C4