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

Make IVoiced require explicit implementation

Browse Source
This commit is contained in:
reaperrr
2018-04-29 04:43:46 +02:00
committed by Paul Chote
parent da29250711
commit cc4c5a5492
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -182,6 +182,7 @@ namespace OpenRA.Traits
public interface INotifyOwnerChanged { void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner); } public interface INotifyOwnerChanged { void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner); }
public interface INotifyEffectiveOwnerChanged { void OnEffectiveOwnerChanged(Actor self, Player oldEffectiveOwner, Player newEffectiveOwner); } public interface INotifyEffectiveOwnerChanged { void OnEffectiveOwnerChanged(Actor self, Player oldEffectiveOwner, Player newEffectiveOwner); }
[RequireExplicitImplementation]
public interface IVoiced public interface IVoiced
{ {
string VoiceSet { get; } string VoiceSet { get; }

8
OpenRA.Mods.Common/Traits/Voiced.cs
View File

@@ -35,9 +35,9 @@ namespace OpenRA.Mods.Common.Traits
Info = info; Info = info;
} }
public string VoiceSet { get { return Info.VoiceSet; } } string IVoiced.VoiceSet { get { return Info.VoiceSet; } }
public bool PlayVoice(Actor self, string phrase, string variant) bool IVoiced.PlayVoice(Actor self, string phrase, string variant)
{ {
if (phrase == null) if (phrase == null)
return false; return false;
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits
return Game.Sound.PlayPredefined(SoundType.World, self.World.Map.Rules, null, self, type, phrase, variant, true, WPos.Zero, volume, true); return Game.Sound.PlayPredefined(SoundType.World, self.World.Map.Rules, null, self, type, phrase, variant, true, WPos.Zero, volume, true);
} }
public bool PlayVoiceLocal(Actor self, string phrase, string variant, float volume) bool IVoiced.PlayVoiceLocal(Actor self, string phrase, string variant, float volume)
{ {
if (phrase == null) if (phrase == null)
return false; return false;
@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Traits
return Game.Sound.PlayPredefined(SoundType.World, self.World.Map.Rules, null, self, type, phrase, variant, false, self.CenterPosition, volume, true); return Game.Sound.PlayPredefined(SoundType.World, self.World.Map.Rules, null, self, type, phrase, variant, false, self.CenterPosition, volume, true);
} }
public bool HasVoice(Actor self, string voice) bool IVoiced.HasVoice(Actor self, string voice)
{ {
if (string.IsNullOrEmpty(Info.VoiceSet)) if (string.IsNullOrEmpty(Info.VoiceSet))
return false; return false;