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

Merge pull request #3405 from Mailaender/fort-bugstar

Browse Source 
Fixed the worsed problems in Fort Lonestar
This commit is contained in:
Chris Forbes
2013-06-16 21:37:07 -07:00
parent 6735fd593b b2201a0463
commit 787fde31ed
8 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,9 +31,11 @@ namespace OpenRA.Mods.RA.Crates
// We want neither of these properties for crate power proxies.
public override void Activate(Actor collector)
{
base.Activate(collector);
collector.World.AddFrameEndTask(w => w.CreateActor(Info.Proxy, new TypeDictionary
{
new OwnerInit( collector.Owner )
new OwnerInit(collector.Owner)
}));
}
}

23
OpenRA.Mods.RA/Missions/FortScript.cs → OpenRA.Mods.RA/Missions/FortLonestarScript.cs
View File

@@ -1,23 +1,28 @@
using System.Collections.Generic;
#region Copyright & License Information
/*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Drawing;
using System.Linq;
using System;
using OpenRA.FileFormats;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Move;
using OpenRA.Network;
using OpenRA.Scripting;
using OpenRA.Traits;
using OpenRA.Widgets;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Effects;
namespace OpenRA.Mods.RA.Missions
{
class FortScriptInfo : TraitInfo<FortScript>, Requires<SpawnMapActorsInfo> { }
class FortLonestarScriptInfo : TraitInfo<FortLonestarScript>, Requires<SpawnMapActorsInfo> { }
class FortScript : IWorldLoaded, ITick
class FortLonestarScript : IWorldLoaded, ITick
{
Player multi0;
Player soviets;

4
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -251,6 +251,8 @@
<Compile Include="Lint\CheckTraitPrerequisites.cs" />
<Compile Include="Lint\LintBuildablePrerequisites.cs" />
<Compile Include="Missions\DesertShellmapScript.cs" />
<Compile Include="Missions\FortLonestarScript.cs" />
<Compile Include="Missions\Survival02Script.cs" />
<Compile Include="MPStartLocations.cs" />
<Compile Include="Mine.cs" />
<Compile Include="Minelayer.cs" />
@@ -499,4 +501,4 @@ cd "$(SolutionDir)thirdparty/"
copy "FuzzyLogicLibrary.dll" "$(SolutionDir)"
cd "$(SolutionDir)"</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>