Merge pull request #13 from alexeijd/master

Small fixes to M1 & A-10
bhugh · Sep 24, 2019 · a2303b5 · a2303b5
2 parents 23b707c + 0e41de2
commit a2303b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...craft/A-10-Bombable/Models/A-10-model.xml → AI/Aircraft/A-10-Bombable/Models/A-10.xml b/...craft/A-10-Bombable/Models/A-10-model.xml → AI/Aircraft/A-10-Bombable/Models/A-10.xml
@@ -6,8 +6,8 @@
 <PropertyList include="A-10-bombableinclude.xml">
 
 
-	<path>../../../../Aircraft/A-10-Bombable/Models/A10-004-015l3.ac</path>
-    <texture-path>../../../../Aircraft/A-10-Bombable/Models</texture-path>
+	<path>Aircraft/A-10-Bombable/Models/A10-004-015l3.ac</path>
+    <texture-path>Aircraft/A-10-Bombable/Models</texture-path>
 
 
 	<!-- Select the external loads as appropriate -->

diff --git a/AI/Aircraft/M1-Abrams-Bombable/m1-bombableinclude.xml b/AI/Aircraft/M1-Abrams-Bombable/m1-bombableinclude.xml
@@ -19,7 +19,7 @@
 			#listener function to change livery color if value is change (via dialogue for instance)
 			var m1_change_color = func(myTankNodeName) {
           
-          return;
+#          return;
           
           var damageValue = getprop(""~myTankNodeName~"/bombable/attributes/damage");
           if (damageValue==nil ) damageValue=0;
@@ -30,9 +30,9 @@
           else var base_color = "Models/camo";
           
           bombable.set_livery (cmdarg().getPath(), 
-             base_color~".png", 
+            [ base_color~".png",
              base_color~"2.png", 
-             base_color~"3.png");
+             base_color~"3.png" ]);
           
           
       		if((damageValue >= 0.15) and (damageValue < 1.0))
@@ -386,4 +386,4 @@
 			]]>
 		</unload>
  </nasal>  
-</PropertyList>
+</PropertyList>
diff --git a/AI/Aircraft/SPAD-VII-Bombable/Models/spadvii.xml b/AI/Aircraft/SPAD-VII-Bombable/Models/spadvii.xml
@@ -5,8 +5,8 @@
  <description>S.P.A.D. VII</description>
  <author>Emmanuel BARANGER (3D/FDM), Brent Hugh (Bombable)</author>
 
- <path>../../../../Aircraft/SPAD-VII-Bombable/Models/spadvii.ac</path> 
- <texture-path>../../../../Aircraft/SPAD-VII-Bombable/Models/Liveries</texture-path>
+ <path>Aircraft/SPAD-VII-Bombable/Models/spadvii.ac</path> 
+ <texture-path>Aircraft/SPAD-VII-Bombable/Models/Liveries</texture-path>
 
 
   <animation>
@@ -169,4 +169,4 @@
 
 
 
-</PropertyList>
+</PropertyList>