Merge pull request #7872 from Mailaender/storm-effects

Unified FlashPaletteEffect and exposed it to Lua
This commit is contained in:
Oliver Brakmann
2015-07-05 21:08:04 +02:00
26 changed files with 196 additions and 78 deletions

View File

@@ -113,6 +113,11 @@ namespace OpenRA
InternalSoundVolume * volumeModifier, true);
}
public static void StopAudio()
{
soundEngine.StopAllSounds();
}
public static ISound Play(string name) { return Play(null, name, true, WPos.Zero, 1f); }
public static ISound Play(string name, WPos pos) { return Play(null, name, false, pos, 1f); }
public static ISound Play(string name, float volumeModifier) { return Play(null, name, true, WPos.Zero, volumeModifier); }

View File

@@ -339,7 +339,11 @@ namespace OpenRA.Traits
public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning, Map map); }
public interface IObjectivesPanel { string PanelName { get; } }
public interface IObjectivesPanel
{
string PanelName { get; }
int ExitDelay { get; }
}
public interface INotifyObjectivesUpdated
{

View File

@@ -387,6 +387,7 @@ namespace OpenRA
frameEndActions.Clear();
Sound.StopAudio();
Sound.StopMusic();
Sound.StopVideo();