From 23cff1a9e58c8419ce08de8195307e394a688d0e Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sun, 22 Nov 2020 17:40:18 +0000
Subject: [PATCH] Enclose in CDATA tags, use of resolvepath()

---
 Models/A320-200-CFM.xml | 35 ++++++++++++++++++-----------------
 Models/A320-common.xml  |  1 -
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index 94e86e4a..d11dd6ef 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -3,6 +3,24 @@
 <!-- Copyright (c) 2020 Josh Davidson (Octal450) -->
 
 <PropertyList>
+	<!-- Nasal code -->
+	<nasal>
+		<load><![CDATA[
+			print("Test");
+			var livery_update = aircraft.canvas_livery.new(resolvepath("Aircraft/A320-family/Models/Liveries/A320/CFM"));
+			var elements = ["Fuselage", "Wings", "Hstabs", "ElevatorL", "ElevatorR", "FlapL1", "FlapL2", "FlapR1", "FlapR2", "SpoilerL1", "SpoilerL2", "SpoilerL3", "SpoilerL4", "SpoilerL5", "SpoilerR1", "SpoilerR2", "SpoilerR3", "SpoilerR4", "SpoilerR5", "DoorL1", "DoorL4", "DoorR1", "DoorR4", "Cargo1", "Cargo2", "Cargo3", "MLGGearDoorR", "MLGGearDoorL", "MLGWingDoorR1", "MLGWingDoorL1", "MLGWingDoorR2", "MLGWingDoorL2", "NLGForewardDoorL", "NLGForewardDoorR", "NLGAftDoorL", "NLGAftDoorR", "GPUServiceDoor", "AvionicsVentDoor", "OutflowValveDoor1", "OutflowValveDoor2", "ApuFlap", "Rudder", "Sharklet", "WingtipFence"];
+			livery_update.createTarget("fuselage", elements, "/sim/model/livery/texture-fuselage", resolution=8192);
+			livery_update.addLayer("fuselage", "dirt", "Aircraft/A320-family/Models/seam-dirt.png");
+
+			elements = ["EngineCFM56R", "EngineCFM56L", "PylonCFM56R", "PylonCFM56L", "ReverseRDoor1", "ReverseRDoor2", "ReverseRDoor3", "ReverseRDoor4", "ReverseLDoor1", "ReverseLDoor2", "ReverseLDoor3", "ReverseLDoor4"];
+			livery_update.createTarget("engines", elements, "/sim/model/livery/texture-engine");
+			livery_update.addLayer("engines", "dirt", "Aircraft/A320-family/Models/CFM-Dirt-test-s.png");
+		]]></load>
+		<unload><![CDATA[
+			livery_update.stop();
+		]]></unload>
+	</nasal>
+	
 	<name>A320-200-CFM</name>
 	<path>empty.ac</path> <!-- Livery system on MP multimodel -->
 
@@ -15,21 +33,4 @@
 		<name>EnginesCFM</name>
 		<path>Aircraft/A320-family/Models/Engines/XMLs/a320.cfm.xml</path>
 	</model>
-
-	<!-- Nasal code -->
-	<nasal>
-		<load>
-			var livery_update = aircraft.canvas_livery.new("Aircraft/A320-family/Models/Liveries/A320/CFM");
-			var elements = ["Fuselage", "Wings", "Hstabs", "ElevatorL", "ElevatorR", "FlapL1", "FlapL2", "FlapR1", "FlapR2", "SpoilerL1", "SpoilerL2", "SpoilerL3", "SpoilerL4", "SpoilerL5", "SpoilerR1", "SpoilerR2", "SpoilerR3", "SpoilerR4", "SpoilerR5", "DoorL1", "DoorL4", "DoorR1", "DoorR4", "Cargo1", "Cargo2", "Cargo3", "MLGGearDoorR", "MLGGearDoorL", "MLGWingDoorR1", "MLGWingDoorL1", "MLGWingDoorR2", "MLGWingDoorL2", "NLGForewardDoorL", "NLGForewardDoorR", "NLGAftDoorL", "NLGAftDoorR", "GPUServiceDoor", "AvionicsVentDoor", "OutflowValveDoor1", "OutflowValveDoor2", "ApuFlap", "Rudder", "Sharklet", "WingtipFence"];
-			livery_update.createTarget("fuselage", elements, "/sim/model/livery/texture-fuselage", resolution=8192);
-			livery_update.addLayer("fuselage", "dirt", "Aircraft/A320-family/Models/seam-dirt.png");
-
-			elements = ["EngineCFM56R", "EngineCFM56L", "PylonCFM56R", "PylonCFM56L", "ReverseRDoor1", "ReverseRDoor2", "ReverseRDoor3", "ReverseRDoor4", "ReverseLDoor1", "ReverseLDoor2", "ReverseLDoor3", "ReverseLDoor4"];
-			livery_update.createTarget("engines", elements, "/sim/model/livery/texture-engine");
-			livery_update.addLayer("engines", "dirt", "Aircraft/A320-family/Models/CFM-Dirt-test-s.png");
-		</load>
-		<unload>
-			livery_update.stop();
-		</unload>
-	</nasal>
 </PropertyList>
diff --git a/Models/A320-common.xml b/Models/A320-common.xml
index f408d4a1..f82cf767 100644
--- a/Models/A320-common.xml
+++ b/Models/A320-common.xml
@@ -4,7 +4,6 @@
 
 <PropertyList>
 	<name>A320-200</name>
-	<path>empty.ac</path> <!-- Livery system on MP multimodel -->
 
 	<model>
 		<name>FuselageContainer</name>