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

fake buildings now work.

Browse Source
This commit is contained in:
Bob
2009-10-10 23:21:31 +13:00
parent 3da8d35ce0
commit dc4c1cce1b
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRa.Game/Actor.cs
View File

@@ -62,6 +62,7 @@ namespace OpenRa.Game
///// TODO: planes ///// ///// TODO: planes /////
///// buildings ///// ///// buildings /////
//TODO: SBAG, BRIK, FENC, etc
case "iron": case "iron":
case "pdox": case "pdox":
case "mslo": case "mslo":
@@ -81,13 +82,16 @@ namespace OpenRa.Game
case "fix": case "fix":
case "spen": case "spen":
case "syrd": case "syrd":
//GAP case "gap":
//SBAG, BRIK, FENC
//FACF, WEAF, SYRF, SPEF, DOMF
case "pbox": case "pbox":
case "hbox": case "hbox":
case "tsla": case "tsla":
case "ftur": case "ftur":
case "facf":
case "weaf":
case "syrf":
case "spef":
case "domf":
traits.Add( new Traits.Building( this ) ); traits.Add( new Traits.Building( this ) );
traits.Add( new Traits.RenderBuilding( this ) ); traits.Add( new Traits.RenderBuilding( this ) );
break; break;
@@ -102,6 +106,7 @@ namespace OpenRa.Game
traits.Add( new Traits.Turreted( this ) ); traits.Add( new Traits.Turreted( this ) );
traits.Add( new Traits.RenderBuildingTurreted( this ) ); traits.Add( new Traits.RenderBuildingTurreted( this ) );
break; break;
default: default:
throw new NotImplementedException( "Actor traits for " + name ); throw new NotImplementedException( "Actor traits for " + name );
} }
@@ -159,7 +164,7 @@ namespace OpenRa.Game
public RenderSimple( Actor self ) public RenderSimple( Actor self )
{ {
anim = new Animation( self.unitInfo.Name ); anim = new Animation( self.unitInfo.Image ?? self.unitInfo.Name );
} }
public abstract IEnumerable<Pair<Sprite, float2>> Render( Actor self ); public abstract IEnumerable<Pair<Sprite, float2>> Render( Actor self );

2
OpenRa.Game/GameRules/UnitInfo.cs
View File

@@ -96,7 +96,7 @@ namespace OpenRa.Game.GameRules
field.SetValue( this, float.Parse( x.Value ) ); field.SetValue( this, float.Parse( x.Value ) );
else if( field.FieldType == typeof( string ) ) else if( field.FieldType == typeof( string ) )
field.SetValue( this, x.Value ); field.SetValue( this, x.Value.ToLowerInvariant() );
else if( field.FieldType == typeof( ArmorType ) ) else if( field.FieldType == typeof( ArmorType ) )
field.SetValue( this, Enum<ArmorType>.Parse(x.Value) ); field.SetValue( this, Enum<ArmorType>.Parse(x.Value) );

2
OpenRa.Game/MainWindow.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRa.Game
FileSystem.Mount(new Folder("../../../../")); FileSystem.Mount(new Folder("../../../../"));
FileSystem.Mount(new Package("redalert.mix")); FileSystem.Mount(new Package("redalert.mix"));
FileSystem.Mount(new Package("conquer.mix")); FileSystem.Mount(new Package("conquer.mix"));
FileSystem.Mount(new Package("hires.mix")); FileSystem.Mount(new Package("hires.mix"));
FileSystem.Mount(new Package("general.mix")); FileSystem.Mount(new Package("general.mix"));
FormBorderStyle = FormBorderStyle.None; FormBorderStyle = FormBorderStyle.None;