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

works *without* aftermath again.

Browse Source
This commit is contained in:
Chris Forbes
2009-11-26 20:49:54 +13:00
parent 9166029fc8
commit 1948e16a3f
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRa.Game/Game.cs
View File

@@ -63,6 +63,7 @@ namespace OpenRa.Game
controller = new Controller(); controller = new Controller();
worldRenderer = new WorldRenderer( renderer ); worldRenderer = new WorldRenderer( renderer );
SequenceProvider.Initialize(useAftermath);
viewport = new Viewport( clientSize, Rules.Map.Offset, Rules.Map.Offset + Rules.Map.Size, renderer ); viewport = new Viewport( clientSize, Rules.Map.Offset, Rules.Map.Offset + Rules.Map.Size, renderer );
world = new World(); world = new World();

11
OpenRa.Game/Graphics/SequenceProvider.cs
View File

@@ -12,10 +12,17 @@ namespace OpenRa.Game.Graphics
static Dictionary<string, CursorSequence> cursors = new Dictionary<string, CursorSequence>(); static Dictionary<string, CursorSequence> cursors = new Dictionary<string, CursorSequence>();
static SequenceProvider() public static void Initialize( bool useAftermath )
{
LoadSequenceSource("sequences.xml");
if (useAftermath)
LoadSequenceSource("sequences-aftermath.xml");
}
static void LoadSequenceSource(string filename)
{ {
XmlDocument document = new XmlDocument(); XmlDocument document = new XmlDocument();
document.Load(FileSystem.Open("sequences.xml")); document.Load(FileSystem.Open(filename));
foreach (XmlElement eUnit in document.SelectNodes("/sequences/unit")) foreach (XmlElement eUnit in document.SelectNodes("/sequences/unit"))
LoadSequencesForUnit(eUnit); LoadSequencesForUnit(eUnit);

4
OpenRa.Game/Traits/Activities/DeliverOre.cs
View File

@@ -45,8 +45,8 @@ namespace OpenRa.Game.Traits.Activities
umt = mobile.GetMovementType(), umt = mobile.GetMovementType(),
checkForBlocked = false, checkForBlocked = false,
}; };
var refineries = Game.world.Actors.Where( x => x.unitInfo != null var refineries = Game.world.Actors.Where( x => x.traits.Contains<AcceptsOre>()
&& x.unitInfo.Name == "proc" && x.Owner == self.Owner ).ToList(); && x.Owner == self.Owner ).ToList();
if( refinery != null ) if( refinery != null )
search.AddInitialCell( refinery.Location + refineryDeliverOffset ); search.AddInitialCell( refinery.Location + refineryDeliverOffset );
else else

20
sequences-aftermath.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<sequences>
<!-- aftermath units -->
<unit name="qtnk">
<sequence name="idle" start="0" length="32" />
</unit>
<unit name="ctnk">
<sequence name="idle" start="0" length="32" />
</unit>
<unit name="dtrk">
<sequence name="idle" start="0" length="32" />
</unit>
<unit name="msub">
<sequence name="idle" start="0" length="16" />
</unit>
<unit name="ttnk">
<sequence name="idle" start="0" length="32" />
<sequence name="spinner" start="32" length="32" />
</unit>
</sequences>

16
sequences.xml
View File

@@ -520,20 +520,4 @@
<sequence name="loop" start="49" length="42" /> <sequence name="loop" start="49" length="42" />
<sequence name="end" start="0" length="26" /> <sequence name="end" start="0" length="26" />
</unit> </unit>
<unit name="qtnk">
<sequence name="idle" start="0" length="32" />
</unit>
<unit name="ctnk">
<sequence name="idle" start="0" length="32" />
</unit>
<unit name="dtrk">
<sequence name="idle" start="0" length="32" />
</unit>
<unit name="msub">
<sequence name="idle" start="0" length="16" />
</unit>
<unit name="ttnk">
<sequence name="idle" start="0" length="32" />
<sequence name="spinner" start="32" length="32" />
</unit>
</sequences> </sequences>