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

Game.IssueOrder wrapper for OM; moved some more features into mod

Browse Source
This commit is contained in:
Chris Forbes
2010-01-29 19:34:13 +13:00
parent 3cf1ec5b45
commit 603bb44529
8 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Chat.cs
View File

@@ -15,7 +15,7 @@ namespace OpenRa
public void Toggle()
{
if (isChatting && typing.Length > 0)
Game.orderManager.IssueOrder(Order.Chat(typing));
Game.IssueOrder(Order.Chat(typing));
typing = "";
isChatting ^= true;

18
OpenRa.Game/Chrome.cs
View File

@@ -277,7 +277,7 @@ namespace OpenRa
AddUiButton(new int2(r.Left + 200, r.Bottom - 40), "OK",
_ =>
{
Game.orderManager.IssueOrder(Order.Chat("/map " + currentMap.Filename));
Game.IssueOrder(Order.Chat("/map " + currentMap.Filename));
showMapChooser = false;
});
@@ -343,19 +343,19 @@ namespace OpenRa
while (!PaletteAvailable(newpalette) && newpalette != (int)Game.world.LocalPlayer.Palette)
newpalette = (newpalette + d) % 8;
Game.orderManager.IssueOrder(
Game.IssueOrder(
Order.Chat("/pal " + newpalette));
}
void CycleRace(bool left)
{
Game.orderManager.IssueOrder(
Game.IssueOrder(
Order.Chat("/race " + (((int)Game.world.LocalPlayer.Race - 1) ^ 1)));
}
void CycleReady(bool left)
{
Game.orderManager.IssueOrder(
Game.IssueOrder(
new Order("ToggleReady", Game.world.LocalPlayer.PlayerActor, "") { IsImmediate = true });
}
@@ -580,7 +580,7 @@ namespace OpenRa
{
var queue = world.LocalPlayer.PlayerActor.traits.Get<Traits.ProductionQueue>();
foreach( var item in queue.AllItems( groupName ) )
Game.orderManager.IssueOrder(Order.CancelProduction(world.LocalPlayer, item.Item));
Game.IssueOrder(Order.CancelProduction(world.LocalPlayer, item.Item));
}
void ChooseAvailableTab( World world )
@@ -958,7 +958,7 @@ namespace OpenRa
{
var unit = Rules.Info[item];
Sound.Play(unit.Traits.Contains<BuildingInfo>() ? "abldgin1.aud" : "train1.aud");
Game.orderManager.IssueOrder(Order.StartProduction(world.LocalPlayer, item));
Game.IssueOrder(Order.StartProduction(world.LocalPlayer, item));
}
void HandleBuildPalette( World world, string item, bool isLmb )
@@ -983,7 +983,7 @@ namespace OpenRa
if (producing.Paused)
{
Game.orderManager.IssueOrder(Order.PauseProduction(player, item, false));
Game.IssueOrder(Order.PauseProduction(player, item, false));
return;
}
}
@@ -998,12 +998,12 @@ namespace OpenRa
if (producing.Paused || producing.Done || producing.TotalCost == producing.RemainingCost)
{
Sound.Play("cancld1.aud");
Game.orderManager.IssueOrder(Order.CancelProduction(player, item));
Game.IssueOrder(Order.CancelProduction(player, item));
}
else
{
Sound.Play("onhold1.aud");
Game.orderManager.IssueOrder(Order.PauseProduction(player, item, true));
Game.IssueOrder(Order.PauseProduction(player, item, true));
}
}
}

2
OpenRa.Game/Game.cs
View File

@@ -210,6 +210,8 @@ namespace OpenRa
changePending = true;
}
public static void IssueOrder(Order o) { orderManager.IssueOrder(o); } /* avoid exposing the OM to mod code */
public static void StartGame()
{
var available = world.Map.SpawnPoints.ToList();

2
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -226,8 +226,6 @@
<Compile Include="Traits\NukePower.cs" />
<Compile Include="Traits\Passenger.cs" />
<Compile Include="Traits\PlaceBuilding.cs" />
<Compile Include="Traits\SonarPulsePower.cs" />
<Compile Include="Traits\SpyPlanePower.cs" />
<Compile Include="Traits\SupportPower.cs" />
<Compile Include="Traits\ProvidesRadar.cs" />
<Compile Include="Traits\Repairable.cs" />

2
OpenRa.Game/PackageDownloader.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRa
Game.chat.AddLine(Color.White, "Debug", "Requesting package: {0}".F(currentPackage));
Game.orderManager.IssueOrder(
Game.IssueOrder(
new Order("RequestFile", null, currentPackage) { IsImmediate = true });
Fraction = 0f;

2
OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
View File

@@ -66,7 +66,9 @@
<Compile Include="RenderSpy.cs" />
<Compile Include="RepairableNear.cs" />
<Compile Include="Crate Actions\SpeedUpgrade.cs" />
<Compile Include="SonarPulsePower.cs" />
<Compile Include="Spy.cs" />
<Compile Include="SpyPlanePower.cs" />
<Compile Include="Thief.cs" />
</ItemGroup>
<ItemGroup>

9
OpenRa.Game/Traits/SonarPulsePower.cs → OpenRa.Mods.RA/SonarPulsePower.cs
View File

@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRa.Orders;
using OpenRa.Traits;
namespace OpenRa.Traits
namespace OpenRa.Mods.RA
{
public class SonarPulsePowerInfo : SupportPowerInfo
{
@@ -19,7 +16,7 @@ namespace OpenRa.Traits
protected override void OnActivate()
{
Game.orderManager.IssueOrder(new Order("SonarPulse", Owner.PlayerActor));
Game.IssueOrder(new Order("SonarPulse", Owner.PlayerActor));
}
public void ResolveOrder(Actor self, Order order)

8
OpenRa.Game/Traits/SpyPlanePower.cs → OpenRa.Mods.RA/SpyPlanePower.cs
View File

@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections.Generic;
using OpenRa.Traits;
using OpenRa.Traits.Activities;
namespace OpenRa.Traits
namespace OpenRa.Mods.RA
{
class SpyPlanePowerInfo : SupportPowerInfo
{