From 71b1cf9cb22e4b76de96b3be96bf766bb73c0cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 7 Feb 2013 16:08:37 +0100
Subject: [PATCH] move Nod01 to cnc-classic mod; fix FMV, music; avoid menu
 crash

---
 OpenRA.Mods.Cnc/Missions/Nod01Script.cs       |  37 ++++--------------
 .../NOD_01 => cnc-classic/maps/nod01}/map.bin | Bin
 .../maps/nod01}/map.yaml                      |  10 ++---
 3 files changed, 10 insertions(+), 37 deletions(-)
 rename mods/{cnc/maps/NOD_01 => cnc-classic/maps/nod01}/map.bin (100%)
 rename mods/{cnc/maps/NOD_01 => cnc-classic/maps/nod01}/map.yaml (96%)

diff --git a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs
index f2d8582708..8d2385b291 100644
--- a/OpenRA.Mods.Cnc/Missions/Nod01Script.cs
+++ b/OpenRA.Mods.Cnc/Missions/Nod01Script.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -16,7 +17,6 @@ using OpenRA.Mods.Cnc;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Activities;
-//using OpenRA.Mods.RA.Air;
 using OpenRA.Network;
 using OpenRA.Scripting;
 using OpenRA.Traits;
@@ -205,35 +205,12 @@ namespace OpenRA.Mods.Cnc.Missions
             nr2 = actors["NODReinforceNthB"];
             gr1 = actors["GDIReinforceNth"];
             Game.MoveViewport(nr1.Location.ToFloat2());
-            //Game.ConnectionStateChanged += StopMusic;
-            //causes an exception atm
-            //Media.PlayFMVFullscreen(w, "nod1.vqa", () =>
-            //{
-            //    Media.PlayFMVFullscreen(w, "landing.vqa", () =>
-            //    {
-            //        PlayMusic();
-            //    });
-            //});
-        }
-
-        void PlayMusic()
-        {
-            if (!Rules.InstalledMusic.Any())
-            {
-                return;
-            }
-            //somehow get this to play aoi, did it in the map.yaml
-            var track = Rules.InstalledMusic.Random(Game.CosmeticRandom);
-            Sound.PlayMusicThen(track.Value, PlayMusic);
-        }
-
-        void StopMusic(OrderManager orderManager)
-        {
-            if (!orderManager.GameStarted)
-            {
-                Sound.StopMusic();
-                Game.ConnectionStateChanged -= StopMusic;
-            }
+			Action afterFMV = () =>
+			{
+				Sound.PlayMusic(Rules.Music["aoi"]);
+			};
+			Game.RunAfterDelay(0, () => Media.PlayFMVFullscreen(w, "nod1pre.vqa", () =>
+			                            Media.PlayFMVFullscreen(w, "nod1.vqa", afterFMV)));
         }
     }
 }
diff --git a/mods/cnc/maps/NOD_01/map.bin b/mods/cnc-classic/maps/nod01/map.bin
similarity index 100%
rename from mods/cnc/maps/NOD_01/map.bin
rename to mods/cnc-classic/maps/nod01/map.bin
diff --git a/mods/cnc/maps/NOD_01/map.yaml b/mods/cnc-classic/maps/nod01/map.yaml
similarity index 96%
rename from mods/cnc/maps/NOD_01/map.yaml
rename to mods/cnc-classic/maps/nod01/map.yaml
index 83feefbe78..9eefe03e62 100644
--- a/mods/cnc/maps/NOD_01/map.yaml
+++ b/mods/cnc-classic/maps/nod01/map.yaml
@@ -2,9 +2,9 @@ Selectable: True
 
 MapFormat: 5
 
-Title: NOD_01
+Title: Nikoomba's Demise
 
-Description: Recreation of first Nod mission from Cnc
+Description: Conversion of first Nod mission from Cnc
 
 Author: Dan9550
 
@@ -16,7 +16,7 @@ Bounds: 21,14,37,24
 
 UseAsShellmap: False
 
-Type: Mission
+Type: Campaign
 
 Players:
 	PlayerReference@Neutral:
@@ -285,11 +285,7 @@ Rules:
 		-CrateSpawner:
 		-SpawnMPUnits:
 		-MPStartLocations:
-		PlayMusicOnMapLoad:
-			Music: aoi2
 		Nod01Script:
-		MissionObjectivesPanel:
-			ObjectivesPanel: MISSION_OBJECTIVES
 	C10:
 		Tooltip:
 			Name: Nikoomba