merged
This commit is contained in:
@@ -4,6 +4,7 @@ using System.Linq;
|
||||
using System.IO;
|
||||
using OpenRa.FileFormats;
|
||||
using OpenRa.Game.Graphics;
|
||||
using IjwFramework.Types;
|
||||
|
||||
namespace OpenRa.Game.GameRules
|
||||
{
|
||||
@@ -98,7 +99,7 @@ namespace OpenRa.Game.GameRules
|
||||
field.SetValue( this, x.Value );
|
||||
|
||||
else if( field.FieldType == typeof( ArmorType ) )
|
||||
field.SetValue( this, Enum.Parse( typeof( ArmorType ), x.Value ) );
|
||||
field.SetValue( this, Enum<ArmorType>.Parse(x.Value) );
|
||||
|
||||
else if( field.FieldType == typeof( bool ) )
|
||||
field.SetValue( this, ParseYesNo( x.Value ) );
|
||||
|
||||
@@ -72,6 +72,14 @@
|
||||
<sequence name="make" start="0" length="*" src="barrmake" />
|
||||
</unit>
|
||||
|
||||
<!-- allied barracks -->
|
||||
|
||||
<unit name="tent">
|
||||
<sequence name="idle" start="0" length="10"/>
|
||||
<sequence name="damaged-idle" start="10" length="10"/>
|
||||
<sequence name="make" start="0" length="*" src="tentmake" />
|
||||
</unit>
|
||||
|
||||
<!-- radar dome -->
|
||||
|
||||
<unit name="dome">
|
||||
|
||||
Reference in New Issue
Block a user