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

fix broken rebase

Browse Source
This commit is contained in:
Bob
2010-08-01 19:31:25 +12:00
parent 970eb4d6e1
commit dfc24233f7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Crates/CloakCrateAction.cs
View File

@@ -8,6 +8,8 @@
*/
#endregion
using OpenRA.FileFormats;
namespace OpenRA.Mods.RA.Crates
{
class CloakCrateActionInfo : CrateActionInfo
@@ -37,7 +39,7 @@ namespace OpenRA.Mods.RA.Crates
var cloakInfo = new CloakInfo(Info.InitialDelay, Info.CloakDelay,
Info.CloakSound, Info.UncloakSound);
var cloak = cloakInfo.Create(new ActorInitializer(collector, collector.Location));
var cloak = cloakInfo.Create(new ActorInitializer(collector, new TypeDictionary() ));
collector.World.AddFrameEndTask(w =>
{

2
OpenRA.Mods.RA/ReservableProduction.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA
class ReservableProduction : Production
{
public override bool Produce(Actor self, OpenRA.GameRules.ActorInfo producee)
public override bool Produce(Actor self, ActorInfo producee)
{
if (Reservable.IsReserved(self))
return false;