From 0eac2afff474b6931af6c9945080f1f535154dfa Mon Sep 17 00:00:00 2001 From: Pavlos Touboulidis Date: Sun, 11 May 2014 03:32:56 +0300 Subject: [PATCH] Assign world from the constructor and make the field readonly --- OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs b/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs index 4d1993cb84..fc7775324b 100644 --- a/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs +++ b/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs @@ -19,23 +19,22 @@ namespace OpenRA.Mods.RA public readonly string Music = null; public readonly bool Loop = false; - public object Create(ActorInitializer init) { return new PlayMusicOnMapLoad(this); } + public object Create(ActorInitializer init) { return new PlayMusicOnMapLoad(init.world, this); } } class PlayMusicOnMapLoad : IWorldLoaded { readonly PlayMusicOnMapLoadInfo info; - World world; + readonly World world; - public PlayMusicOnMapLoad(PlayMusicOnMapLoadInfo info) + public PlayMusicOnMapLoad(World world, PlayMusicOnMapLoadInfo info) { + this.world = world; this.info = info; } public void WorldLoaded(World world, WorldRenderer wr) { - this.world = world; - PlayMusic(); }