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

Rename Enter to LegacyEnter.

Browse Source
This commit is contained in:
Paul Chote
2019-01-29 21:46:11 +00:00
committed by Oliver Brakmann
parent 83212b100e
commit 1f7b558b29
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Activities/Infiltrate.cs
View File

@@ -19,7 +19,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Activities namespace OpenRA.Mods.Cnc.Activities
{ {
class Infiltrate : Enter class Infiltrate : LegacyEnter
{ {
readonly Actor target; readonly Actor target;
readonly Infiltrates infiltrates; readonly Infiltrates infiltrates;

2
OpenRA.Mods.Common/Activities/CaptureActor.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class CaptureActor : Enter public class CaptureActor : LegacyEnter
{ {
readonly Actor actor; readonly Actor actor;
readonly CaptureManager targetManager; readonly CaptureManager targetManager;

2
OpenRA.Mods.Common/Activities/Demolish.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class Demolish : Enter class Demolish : LegacyEnter
{ {
readonly Actor target; readonly Actor target;
readonly IDemolishable[] demolishables; readonly IDemolishable[] demolishables;

2
OpenRA.Mods.Common/Activities/DonateCash.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class DonateCash : Enter class DonateCash : LegacyEnter
{ {
readonly Actor target; readonly Actor target;
readonly int payload; readonly int payload;

2
OpenRA.Mods.Common/Activities/DonateExperience.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class DonateExperience : Enter class DonateExperience : LegacyEnter
{ {
readonly Actor target; readonly Actor target;
readonly GainsExperience targetGainsExperience; readonly GainsExperience targetGainsExperience;

2
OpenRA.Mods.Common/Activities/EnterTransport.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class EnterTransport : Enter class EnterTransport : LegacyEnter
{ {
readonly Passenger passenger; readonly Passenger passenger;
readonly int maxTries; readonly int maxTries;

4
OpenRA.Mods.Common/Activities/Enter.cs → OpenRA.Mods.Common/Activities/LegacyEnter.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Activities
{ {
public enum EnterBehaviour { Exit, Suicide, Dispose } public enum EnterBehaviour { Exit, Suicide, Dispose }
public abstract class Enter : Activity public abstract class LegacyEnter : Activity
{ {
public enum ReserveStatus { None, TooFar, Pending, Ready } public enum ReserveStatus { None, TooFar, Pending, Ready }
enum EnterState { ApproachingOrEntering, WaitingToEnter, Inside, Exiting, Done } enum EnterState { ApproachingOrEntering, WaitingToEnter, Inside, Exiting, Done }
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Activities
Activity inner; Activity inner;
bool firstApproach = true; bool firstApproach = true;
protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1, protected LegacyEnter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1,
bool repathWhileMoving = true, Color? targetLineColor = null) bool repathWhileMoving = true, Color? targetLineColor = null)
{ {
move = self.Trait<IMove>(); move = self.Trait<IMove>();

2
OpenRA.Mods.Common/Activities/RepairBridge.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class RepairBridge : Enter class RepairBridge : LegacyEnter
{ {
readonly Actor target; readonly Actor target;
readonly LegacyBridgeHut legacyHut; readonly LegacyBridgeHut legacyHut;

2
OpenRA.Mods.Common/Activities/RepairBuilding.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities namespace OpenRA.Mods.Common.Activities
{ {
class RepairBuilding : Enter class RepairBuilding : LegacyEnter
{ {
readonly Actor target; readonly Actor target;
readonly IHealth health; readonly IHealth health;

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -91,7 +91,7 @@
<Compile Include="Activities\DeployForGrantedCondition.cs" /> <Compile Include="Activities\DeployForGrantedCondition.cs" />
<Compile Include="Activities\DonateCash.cs" /> <Compile Include="Activities\DonateCash.cs" />
<Compile Include="Activities\DonateExperience.cs" /> <Compile Include="Activities\DonateExperience.cs" />
<Compile Include="Activities\Enter.cs" /> <Compile Include="Activities\LegacyEnter.cs" />
<Compile Include="Activities\EnterTransport.cs" /> <Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\FindResources.cs" /> <Compile Include="Activities\FindResources.cs" />
<Compile Include="Activities\HarvestResource.cs" /> <Compile Include="Activities\HarvestResource.cs" />