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

Merge branch 'chris'

Browse Source
This commit is contained in:
Chris Forbes
2010-05-06 08:15:57 +12:00
parent ecfba3dad8 9297aedfcc
commit 00a9e2519c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Effects/Bullet.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Effects
{ {
t += 40; t += 40;
anim.Tick(); if (anim != null) anim.Tick();
if (t > TotalTime()) Explode( world ); if (t > TotalTime()) Explode( world );

3
OpenRA.Game/Graphics/Animation.cs
View File

@@ -68,6 +68,9 @@ namespace OpenRA.Graphics
public void ReplaceAnim(string sequenceName) public void ReplaceAnim(string sequenceName)
{ {
if (!HasSequence(sequenceName))
return;
CurrentSequence = SequenceProvider.GetSequence(name, sequenceName); CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
frame %= CurrentSequence.Length; frame %= CurrentSequence.Length;
} }

2
OpenRAUploader/Program.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRAUploader
fileStream.Close(); fileStream.Close();
var jsonUri = new UriBuilder(uri.Uri); var jsonUri = new UriBuilder(uri.Uri);
jsonUri.Path += "_version.json"; jsonUri.Path += "version.json";
string formatString = "{{\n" + string formatString = "{{\n" +
"\t\"version\":\"{0}\",\n" + "\t\"version\":\"{0}\",\n" +