From 2d9e5c6fcd246869bf7c129b369a5293a40916a6 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 1 Jul 2010 18:31:13 +1200 Subject: [PATCH] remove spam on loading RA MIX headers; add some more bits to RALint --- OpenRA.FileFormats/Package.cs | 2 -- OpenRA.Game/Traits/Buildable.cs | 2 +- OpenRA.Game/Traits/StoresOre.cs | 2 +- OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj | 6 ++++-- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 4 +++- OpenRA.sln | 6 ++++++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/OpenRA.FileFormats/Package.cs b/OpenRA.FileFormats/Package.cs index 1ffa2c28ef..bea8730400 100644 --- a/OpenRA.FileFormats/Package.cs +++ b/OpenRA.FileFormats/Package.cs @@ -80,8 +80,6 @@ namespace OpenRA.FileFormats ushort numFiles = reader2.ReadUInt16(); uint datasize = reader2.ReadUInt32(); - Console.WriteLine("{0} files, {1} kb", numFiles, datasize >> 10); - s.Position = headerStart; reader = new BinaryReader(s); diff --git a/OpenRA.Game/Traits/Buildable.cs b/OpenRA.Game/Traits/Buildable.cs index 5234b35a26..d84862d0ac 100755 --- a/OpenRA.Game/Traits/Buildable.cs +++ b/OpenRA.Game/Traits/Buildable.cs @@ -33,7 +33,7 @@ namespace OpenRA.Traits class BuildableInfo : ValuedInfo { public readonly string[] Prerequisites = { }; - public readonly string[] BuiltAt = { }; + [ActorReference] public readonly string[] BuiltAt = { }; public readonly string Icon = null; public readonly string[] AlternateName = { }; diff --git a/OpenRA.Game/Traits/StoresOre.cs b/OpenRA.Game/Traits/StoresOre.cs index 7249962622..62f4f32abb 100644 --- a/OpenRA.Game/Traits/StoresOre.cs +++ b/OpenRA.Game/Traits/StoresOre.cs @@ -27,7 +27,7 @@ namespace OpenRA.Traits public readonly int PipCount = 0; public readonly PipType PipColor = PipType.Yellow; public readonly int Capacity = 0; - public readonly string DeathWeapon = null; + [WeaponReference] public readonly string DeathWeapon = null; public object Create(ActorInitializer init) { return new StoresOre(init.self, this); } } diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 941fac750f..6ae14e3bc7 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -1,4 +1,4 @@ - + Debug @@ -78,6 +78,8 @@ --> mkdir "$(SolutionDir)mods/cnc/" -copy "$(TargetPath)" "$(SolutionDir)mods/cnc/" +copy "$(TargetPath)" "$(SolutionDir)mods/cnc/" +cd "$(SolutionDir)" +ralint ra \ No newline at end of file diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index bf6f38d76f..b53bb99fb8 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -206,6 +206,8 @@ --> mkdir "$(SolutionDir)mods/ra/" -copy "$(TargetPath)" "$(SolutionDir)mods/ra/" +copy "$(TargetPath)" "$(SolutionDir)mods/ra/" +cd "$(SolutionDir)" +ralint ra \ No newline at end of file diff --git a/OpenRA.sln b/OpenRA.sln index f198a7e3bf..400c20207a 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -8,10 +8,16 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SequenceEditor", "SequenceEditor\SequenceEditor.csproj", "{230F65CE-A6DE-4235-8B38-13A3D606C7F7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA", "OpenRA.Mods.RA\OpenRA.Mods.RA.csproj", "{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}" + ProjectSection(ProjectDependencies) = postProject + {F9FA4D9F-2302-470A-8A07-6E37F488C124} = {F9FA4D9F-2302-470A-8A07-6E37F488C124} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Aftermath", "OpenRA.Mods.Aftermath\OpenRA.Mods.Aftermath.csproj", "{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Cnc", "OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}" + ProjectSection(ProjectDependencies) = postProject + {F9FA4D9F-2302-470A-8A07-6E37F488C124} = {F9FA4D9F-2302-470A-8A07-6E37F488C124} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Gl", "OpenRA.Gl\OpenRA.Gl.csproj", "{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}" EndProject