From 0e1e62eacc31329d258446420f2255605d3ae29a Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 9 Nov 2009 19:02:24 +1300
Subject: [PATCH] added rally point stuff for barr/tent/kenn

---
 OpenRa.Game/GameRules/UnitInfo.cs | 2 +-
 OpenRa.Game/Traits/RallyPoint.cs  | 2 +-
 units.ini                         | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenRa.Game/GameRules/UnitInfo.cs b/OpenRa.Game/GameRules/UnitInfo.cs
index fa1b1dec72..39789550ca 100755
--- a/OpenRa.Game/GameRules/UnitInfo.cs
+++ b/OpenRa.Game/GameRules/UnitInfo.cs
@@ -97,7 +97,7 @@ namespace OpenRa.Game.GameRules
 			public readonly bool Repairable = true;
 			public readonly int Storage = 0;
 			public readonly bool Unsellable = false;
-			public readonly int[] DefaultRallyPoint = { 1, 3 };
+			public readonly int[] RallyPoint = { 1, 3 };
 
 			public BuildingInfo(string name) : base(name) { }
 		}
diff --git a/OpenRa.Game/Traits/RallyPoint.cs b/OpenRa.Game/Traits/RallyPoint.cs
index f8b2ca50f2..e71f33eeb7 100644
--- a/OpenRa.Game/Traits/RallyPoint.cs
+++ b/OpenRa.Game/Traits/RallyPoint.cs
@@ -16,7 +16,7 @@ namespace OpenRa.Game.Traits
 		public RallyPoint(Actor self)
 		{
 			var bi = (UnitInfo.BuildingInfo)self.unitInfo;
-			rallyPoint = self.Location + new int2(bi.DefaultRallyPoint[0], bi.DefaultRallyPoint[1]);
+			rallyPoint = self.Location + new int2(bi.RallyPoint[0], bi.RallyPoint[1]);
 			anim = new Animation("flagfly");
 			anim.PlayRepeating("idle");
 		}
diff --git a/units.ini b/units.ini
index e28bcdb3b4..c6f3a3f368 100755
--- a/units.ini
+++ b/units.ini
@@ -208,6 +208,7 @@ Traits=Building, RenderWarFactory, RallyPoint
 Dimensions=3,2
 Footprint=xxx xxx
 Produces=Vehicle
+RallyPoint=1,3
 [SYRD]
 Description=Shipyard
 Traits=Building, RenderBuilding
@@ -315,21 +316,24 @@ Dimensions=3,2
 Footprint=xxx xxx
 [BARR]
 Description=Soviet Barracks
-Traits=Building, RenderBuilding
+Traits=Building, RenderBuilding, RallyPoint
 Dimensions=2,2
 Footprint=xx xx
 Produces=Infantry
+RallyPoint=1,3
 [TENT]
 Description=Allied Barracks
 Traits=Building, RenderBuilding
 Dimensions=2,2
 Footprint=xx xx
 Produces=Infantry
+RallyPoint=1,3
 [KENN]
 Description=Kennel
 Traits=Building, RenderBuilding
 Dimensions=1,1
 Footprint=x
+RallyPoint=1,2
 [FIX]
 Description=Service Depot
 Traits=Building, RenderBuilding