Merge pull request #4999 from Mailaender/start-game-notification

Moved StartGameNotification into its own trait

OpenRA.Game/Game.cs

@@ -262,9 +262,6 @@ namespace OpenRA
 			orderManager.LastTickTime = Environment.TickCount;
 			orderManager.StartGame();
 			worldRenderer.RefreshPalette();
-
-			if (!isShellmap)
-				Sound.PlayNotification(null, "Speech", "StartGame", null);
 		}
 
 		public static bool IsHost

OpenRA.Game/GameRules/SoundInfo.cs

@@ -26,12 +26,12 @@ namespace OpenRA.GameRules
 		public readonly string[] DisableVariants = { };
 		public readonly string[] DisablePrefixes = { };
 
-		static Dictionary<string, string[]> Load( MiniYaml y, string name )
+		static Dictionary<string, string[]> Load(MiniYaml y, string name)
 		{
-			return y.NodesDict.ContainsKey( name )
-				? y.NodesDict[ name ].NodesDict.ToDictionary(
+			return y.NodesDict.ContainsKey(name)
+				? y.NodesDict[name].NodesDict.ToDictionary(
 					a => a.Key,
-					a => FieldLoader.GetValue<string[]>( "(value)", a.Value.Value ) )
+					a => FieldLoader.GetValue<string[]>("(value)", a.Value.Value))
 				: new Dictionary<string, string[]>();
 		}
 

OpenRA.Mods.RA/ActorLostNotification.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -22,17 +22,16 @@ namespace OpenRA.Mods.RA
 
 	class ActorLostNotification : INotifyKilled
 	{
-		ActorLostNotificationInfo Info;
+		ActorLostNotificationInfo info;
 		public ActorLostNotification(ActorLostNotificationInfo info)
 		{
-			Info = info;
+			this.info = info;
 		}
 
 		public void Killed(Actor self, AttackInfo e)
 		{
-			var player = (Info.NotifyAll) ? self.World.LocalPlayer : self.Owner;
-			Sound.PlayNotification(player, "Speech", Info.Notification, self.Owner.Country.Race);
+			var player = (info.NotifyAll) ? self.World.LocalPlayer : self.Owner;
+			Sound.PlayNotification(player, "Speech", info.Notification, self.Owner.Country.Race);
 		}
 	}
 }
-

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -496,6 +496,7 @@
     <Compile Include="Buildings\LineBuildNode.cs" />
     <Compile Include="ModChooserLoadScreen.cs" />
     <Compile Include="Render\WithBuildingPlacedAnimation.cs" />
+    <Compile Include="StartGameNotification.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

OpenRA.Mods.RA/StartGameNotification.cs

@@ -0,0 +1,36 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class StartGameNotificationInfo : ITraitInfo
+	{
+		public readonly string Notification = "StartGame";
+
+		public object Create(ActorInitializer init) { return new StartGameNotification(this); }
+	}
+
+	class StartGameNotification : IWorldLoaded
+	{
+		StartGameNotificationInfo info;
+		public StartGameNotification(StartGameNotificationInfo info)
+		{
+			this.info = info;
+		}
+
+		public void WorldLoaded(World w, WorldRenderer wr)
+		{
+			Sound.PlayNotification(null, "Speech", info.Notification, null);
+		}
+	}
+}

mods/ra/maps/desert-shellmap/map.yaml

@@ -1307,6 +1307,7 @@ Rules:
 			LuaScripts: desert-shellmap.lua
 		LoadWidgetAtGameStart:
 			Widget: MAINMENU
+		-StartGameNotification:
 	TRAN.Husk2:
 		Burns:
 			Damage: 0

mods/ra/rules/world.yaml

@@ -165,4 +165,5 @@ World:
 	ValidateOrder:
 	DebugPauseState:
 	RadarPings:
+	StartGameNotification:
 

mods/ts/maps/blank-shellmap/map.yaml

@@ -37,6 +37,7 @@ Smudges:
 
 Rules:
 	World:
+		-StartGameNotification:
 		-SpawnMPUnits:
 		-MPStartLocations:
 		LoadWidgetAtGameStart:

mods/ts/rules/world.yaml

@@ -97,4 +97,5 @@ World:
 	DebugPauseState:
 	ScreenShaker:
 	RadarPings:
+	StartGameNotification: