Merge branch 'work' of D:\Git_New\fgdata

2012-07-21 00:16:51 +01:00 · 2012-07-21 00:16:51 +01:00 · d8a76e4512
commit d8a76e4512
parent 57bf72f11c 84f1701373
31 changed files with 922 additions and 977 deletions
--- a/Aircraft/Instruments-3d/ai/ai.ac
+++ b/Aircraft/Instruments-3d/ai/ai.ac
@ -4,7 +4,7 @@ OBJECT world
 kids 5
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/ai/ai01.rgb"
+texture "ai01.rgb"
 texrep 1 1
 numvert 6
 -0.003966 0.04 -0.04
@ -31,7 +31,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Pitch"
-texture "/home/david/src/blender/Instruments/ai/ai04.rgb"
+texture "ai04.rgb"
 texrep 1 1
 numvert 6
 -0.002938 0.014505 -0.021294
@ -58,7 +58,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Bezel"
-texture "/home/david/src/blender/Instruments/ai/ai05.rgb"
+texture "ai05.rgb"
 texrep 1 1
 numvert 6
 -0.001913 0.006477 -0.012
@ -85,7 +85,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Ring"
-texture "/home/david/src/blender/Instruments/ai/ai02.rgb"
+texture "ai02.rgb"
 texrep 1 1
 numvert 6
 -0.000922 0.04 -0.04
@ -112,7 +112,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Front"
-texture "/home/david/src/blender/Instruments/ai/ai03.rgb"
+texture "ai03.rgb"
 texrep 1 1
 numvert 6
 -1e-05 0.04 -0.04
--- a/Aircraft/Instruments-3d/alt/alt.ac
+++ b/Aircraft/Instruments-3d/alt/alt.ac
@ -88,7 +88,7 @@ refs 3
 kids 0
 OBJECT poly
 name "Face"
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/alt/altimeter.rgb"
+texture "altimeter.rgb"
 crease 45.000000
 numvert 4
 0 0.04 -0.04
@ -109,7 +109,7 @@ name "inhg"
 loc -0.000238663 0.000547649 0.00323039
 data 12
 Cylinder.015
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/alt/altimeter.rgb"
+texture "altimeter.rgb"
 crease 30.000000
 numvert 6
 0.001139 -0.00614271 -0.0291783
@ -137,7 +137,7 @@ kids 0
 OBJECT poly
 name "disk"
 loc 0 -0.0305765 0.0300321
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/alt/knob.rgb"
+texture "knob.rgb"
 crease 101.000000
 numvert 20
 0.01 0.00396059 0.00479285
--- a/Aircraft/Instruments-3d/asi-260-knot.ac
+++ b/Aircraft/Instruments-3d/asi-260-knot.ac
@ -4,7 +4,7 @@ OBJECT world
 kids 3
 OBJECT poly
 name "Background"
-texture "/home/david/src/blender/Instruments/Textures/asi-260-knot.rgb"
+texture "asi-260-knot.rgb"
 numvert 4
 -0.000524 0.050345 -0.05
 -0.000524 -0.049655 -0.05
@ -21,7 +21,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Needle"
-texture "/home/david/src/blender/Instruments/Textures/asi-260-knot.rgb"
+texture "asi-260-knot.rgb"
 numvert 4
 0.002039 0.03301 -0.005
 0.002039 9.7e-05 -0.005
@ -38,7 +38,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Scale"
-texture "/home/david/src/blender/Instruments/Textures/asi-260-knot.rgb"
+texture "asi-260-knot.rgb"
 numvert 4
 0.004861 0.050345 -0.05
 0.004861 -0.049655 -0.05
--- a/Aircraft/Instruments-3d/asi/asi.ac
+++ b/Aircraft/Instruments-3d/asi/asi.ac
@ -52,7 +52,7 @@ refs 3
 kids 0
 OBJECT poly
 name "Face"
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/asi/asi.rgb"
+texture "asi.rgb"
 crease 45.000000
 numvert 4
 0 0.04 -0.04
--- a/Aircraft/Instruments-3d/attitude-indicator.ac
+++ b/Aircraft/Instruments-3d/attitude-indicator.ac
@ -4,7 +4,7 @@ OBJECT world
 kids 5
 OBJECT poly
 name "Background"
-texture "/home/david/src/blender/Instruments/Textures/attitude-indicator.rgb"
+texture "attitude-indicator.rgb"
 numvert 4
 -7.2e-05 -0.037166 -0.038157
 -7.2e-05 -0.037166 0.036843
@ -21,7 +21,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Float"
-texture "/home/david/src/blender/Instruments/Textures/attitude-indicator.rgb"
+texture "attitude-indicator.rgb"
 numvert 4
 0.001422 -0.018106 -0.029359
 0.001422 -0.018106 0.02871
@ -38,7 +38,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Scale"
-texture "/home/david/src/blender/Instruments/Textures/attitude-indicator.rgb"
+texture "attitude-indicator.rgb"
 numvert 4
 0.002915 -0.055916 -0.056907
 0.002915 -0.055916 0.055593
@ -55,7 +55,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/Textures/attitude-indicator.rgb"
+texture "attitude-indicator.rgb"
 numvert 4
 0.005072 -0.037166 -0.038157
 0.005072 -0.037166 0.036843
@ -72,7 +72,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Markings"
-texture "/home/david/src/blender/Instruments/Textures/attitude-indicator.rgb"
+texture "attitude-indicator.rgb"
 numvert 4
 0.006902 -0.018106 -0.029359
 0.006902 -0.018106 0.02871
--- a/Aircraft/Instruments-3d/clock/clock.ac
+++ b/Aircraft/Instruments-3d/clock/clock.ac
@ -75,7 +75,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/clock/clock.rgb"
+texture "clock.rgb"
 texrep 1 1
 numvert 4
 0 0.026 -0.026
--- a/Aircraft/Instruments-3d/comp/comp.ac
+++ b/Aircraft/Instruments-3d/comp/comp.ac
@ -4,7 +4,7 @@ OBJECT world
 kids 1
 OBJECT poly
 name "Ring"
-texture "/home/david/src/blender/Instruments/comp/comp.rgb"
+texture "comp.rgb"
 texrep 1 1
 numvert 48
 -0.012335 0.019626 -0.012335
--- a/Aircraft/Instruments-3d/egt/egt.ac
+++ b/Aircraft/Instruments-3d/egt/egt.ac
@ -27,7 +27,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/egt/egt-01.rgb"
+texture "egt-01.rgb"
 texrep 1 1
 numvert 4
 0 0.028452 -0.028452
--- a/Aircraft/Instruments-3d/hi/hi.ac
+++ b/Aircraft/Instruments-3d/hi/hi.ac
@ -7,7 +7,7 @@ kids 9
 OBJECT poly
 name "Face"
 loc 0.000119331 0 0
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/hi01.rgb"
+texture "hi01.rgb"
 crease 45.000000
 numvert 6
 -0.001458 0.04 -0.04
@ -34,7 +34,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Front"
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/hi02.rgb"
+texture "hi02.rgb"
 crease 45.000000
 numvert 6
 0 0.04 -0.04
@ -62,7 +62,7 @@ kids 0
 OBJECT poly
 name "OBS-Knob"
 loc 0 -0.0297401 0.0293165
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/knob.rgb"
+texture "knob.rgb"
 crease 101.000000
 numvert 20
 0.01 9.31323e-09 0
@ -261,7 +261,7 @@ kids 0
 OBJECT poly
 name "Hdg-Knob"
 loc 0 -0.0300775 -0.0298089
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/knob.rgb"
+texture "knob.rgb"
 crease 101.000000
 numvert 20
 0.01 0.00396059 0.00479285
@ -460,7 +460,7 @@ kids 0
 OBJECT poly
 name "HdgBug"
 loc 0.00155131 0 0
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/hi03.rgb"
+texture "hi03.rgb"
 crease 45.000000
 numvert 6
 -0.0011 0 -0.04
--- a/Aircraft/Instruments-3d/kx170b/kx170b.ac
+++ b/Aircraft/Instruments-3d/kx170b/kx170b.ac
@ -4,7 +4,7 @@ OBJECT world
 kids 1
 OBJECT poly
 name "Plane"
-texture "/home/david/src/blender/Avionics/kx170b/kx170b-01.rgb"
+texture "kx170b-01.rgb"
 texrep 1 1
 numvert 4
 0 0.036 -0.09
--- a/Aircraft/Instruments-3d/radio_stack/RadioStack.ac
+++ b/Aircraft/Instruments-3d/radio_stack/RadioStack.ac
@ -5,7 +5,7 @@ kids 1
 OBJECT poly
 name "RadioStack"
 loc 0.000486599 0.0692169 -8.90131e-05
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/radio_stack/panel-tex02.rgb"
+texture "panel-tex02.rgb"
 crease 45.000000
 numvert 4
 0 0.0657509 -0.0804673
--- a/Aircraft/Instruments-3d/tach/tach.ac
+++ b/Aircraft/Instruments-3d/tach/tach.ac
@ -27,7 +27,7 @@ refs 3
 kids 0
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/tach/tach.rgb"
+texture "tach.rgb"
 texrep 1 1
 numvert 4
 0 0.04 -0.04
--- a/Aircraft/Instruments-3d/tc/tc.ac
+++ b/Aircraft/Instruments-3d/tc/tc.ac
@ -4,7 +4,7 @@ OBJECT world
 kids 3
 OBJECT poly
 name "Ball"
-texture "/home/david/src/blender/Instruments/tc/tc02.rgb"
+texture "tc02.rgb"
 texrep 1 1
 numvert 6
 -0.002953 -0.009821 -0.003159
@ -31,7 +31,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/tc/tc01.rgb"
+texture "tc01.rgb"
 texrep 1 1
 numvert 6
 -0.001458 0.04 -0.04
@ -58,7 +58,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Airplane"
-texture "/home/david/src/blender/Instruments/tc/tc03.rgb"
+texture "tc03.rgb"
 texrep 1 1
 numvert 6
 0 0.008224 -0.025483
--- a/Aircraft/Instruments-3d/vac/vac.ac
+++ b/Aircraft/Instruments-3d/vac/vac.ac
@ -30,7 +30,7 @@ refs 4
 kids 0
 OBJECT poly
 name "Face"
-texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vac/vac-face.rgb"
+texture "vac-face.rgb"
 crease 45.000000
 numvert 4
 0 0.026 -0.026
--- a/Aircraft/Instruments-3d/vsi/vsi.ac
+++ b/Aircraft/Instruments-3d/vsi/vsi.ac
@ -32,7 +32,7 @@ refs 3
 kids 0
 OBJECT poly
 name "Face"
-texture "/home/david/src/blender/Instruments/vsi/vsi.rgb"
+texture "vsi.rgb"
 texrep 1 1
 numvert 4
 0 0.04 -0.04
--- a/Materials/regions/caribbean-farm-buildings.xml
+++ b/Materials/regions/caribbean-farm-buildings.xml
@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Set of generic farm buildings, for inclusion in a materials file -->
+<PropertyList>
+  <range-m>5000</range-m>
+  <object>
+    <path>Models/Buildings/red-barn.ac</path>
+    <path>Models/Buildings/cow-stable.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
+    <coverage-m2>5000</coverage-m2>
+    <heading-type>mask</heading-type>
+  </object>
+</PropertyList>
--- a/Materials/regions/caribbean.xml
+++ b/Materials/regions/caribbean.xml
@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!-- General settings for all caribbean materials -->
+<PropertyList>
+  <!-- Define the caribbean as a box with given latitude/longitude -->
+  <condition>
+    <and>
+     <greater-than>
+      <property>position/longitude-deg</property>
+      <value>-85.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/longitude-deg</property>
+      <value>-40.0</value>
+     </less-than>
+     <greater-than>
+      <property>position/latitude-deg</property>
+      <value>11.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/latitude-deg</property>
+      <value>25</value>
+     </less-than>
+    </and>
+  </condition>
+  
+  <!-- Caribbean buildings definitions. Notes that these will be used for -->
+  <!-- both towns and cities                                              -->
+  <building-texture>Textures/buildings-caribbean.png</building-texture>
+  <building-lightmap>Textures/buildings-caribbean-lightmap.png</building-lightmap>
+  <building-small-min-floors>1</building-small-min-floors>
+  <building-small-max-floors>2</building-small-max-floors>
+  <building-small-max-width-m>20.0</building-small-max-width-m>
+  <building-small-min-depth-m>8.0</building-small-min-depth-m>
+  <building-small-max-depth-m>20.0</building-small-max-depth-m>
+  <building-medium-min-floors>1</building-medium-min-floors>
+  <building-medium-max-floors>3</building-medium-max-floors>
+
+  <!-- Appropriate tropical trees -->
+  <tree-texture>Trees/tropical-summer.png</tree-texture>
+  <tree-varieties>8</tree-varieties>
+  <tree-range-m alias="/params/forest/tree-range-m"/>
+  <tree-height-m>25.0</tree-height-m>
+  <tree-width-m>15.0</tree-width-m>
+  
+</PropertyList>
--- a/Materials/regions/european.xml
+++ b/Materials/regions/european.xml
@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!-- General settings for all European materials -->
+<PropertyList>
+  <!-- Define Europe as a box with given latitude/longitude -->
+  <condition>
+    <and>
+      <equals>
+        <property>sim/startup/season</property>
+        <value>summer</value>
+      </equals>
+    <and>
+     <greater-than>
+      <property>position/longitude-deg</property>
+      <value>-20.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/longitude-deg</property>
+      <value>40.0</value>
+     </less-than>
+     <greater-than>
+      <property>position/latitude-deg</property>
+      <value>35.0</value>
+     </greater-than>
+    </and>
+   </and>
+  </condition>
+  
+  <!-- European buildings definitions. Notes that these will be used for  -->
+  <!-- both towns and cities                                              -->
+  <building-texture>Textures/buildings.png</building-texture>
+  <building-lightmap>Textures/buildings-lightmap.png</building-lightmap>
+
+  
+</PropertyList>
--- a/Materials/regions/hawaii.xml
+++ b/Materials/regions/hawaii.xml
@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!-- General settings for all Hawaii materials -->
+<PropertyList>
+  <!-- Define Hawaii as a box with given latitude/longitude -->
+  <condition>
+   <and>
+     <greater-than>
+      <property>position/longitude-deg</property>
+      <value>-179.0</value>
+     </greater-than>
+     <less-than>
+      <property>position/longitude-deg</property>
+      <value>-154.0</value>
+     </less-than>
+     <greater-than>
+      <property>position/latitude-deg</property>
+      <value>18.8</value>
+     </greater-than>
+     <less-than>
+      <property>position/latitude-deg</property>
+      <value>28.5</value>
+     </less-than>
+   </and>
+  </condition>
+  
+  <!-- Hawaiian buildings definitions. Notes that these will be used for  -->
+  <!-- both towns and cities                                              -->
+  <building-texture>Textures/buildings-caribbean.png</building-texture>
+  <building-lightmap>Textures/buildings-caribbean-lightmap.png</building-lightmap>
+  <building-small-min-floors>1</building-small-min-floors>
+  <building-small-max-floors>2</building-small-max-floors>
+  <building-small-max-width-m>20.0</building-small-max-width-m>
+  <building-small-min-depth-m>8.0</building-small-min-depth-m>
+  <building-small-max-depth-m>20.0</building-small-max-depth-m>
+  <building-medium-min-floors>1</building-medium-min-floors>
+  <building-medium-max-floors>3</building-medium-max-floors>
+  
+</PropertyList>
--- a/Materials/regions/materials.xml
+++ b/Materials/regions/materials.xml
--- a/Shaders/runway.frag
+++ b/Shaders/runway.frag
@ -38,8 +38,6 @@ uniform int fogType;
 vec3 fog_Func(vec3 color, int type);
 //////////////////////

-vec3 fog_Func(vec3 color, int type);
-
 void main (void)
 {
    //vec3 halfV;
--- a/Shaders/sunlight-nofiltering.frag
+++ b/Shaders/sunlight-nofiltering.frag
@ -6,6 +6,7 @@ uniform sampler2D spec_emis_tex;
 uniform sampler2DShadow shadow_tex;
 uniform vec4 fg_SunDiffuseColor;
 uniform vec4 fg_SunSpecularColor;
+uniform vec4 fg_SunAmbientColor;
 uniform vec3 fg_SunDirection;
 uniform vec3 fg_Planes;
 uniform int fg_ShadowNumber;
@ -81,7 +82,7 @@ void main() {
    }

    float matID = texture2D( color_tex, coords ).a * 255.0;
-    if (matID == 255.0)
+    if (matID >= 254.0)
        Idiff += Ispec * spec_emis.x;

    gl_FragColor = vec4(mix(vec3(0.0), Idiff + Ispec, shadow) + Iemis, 1.0);
--- a/Shaders/sunlight-noshadow.frag
+++ b/Shaders/sunlight-noshadow.frag
@ -35,7 +35,7 @@ void main() {
    }

    float matID = texture2D( color_tex, coords ).a * 255.0;
-    if (matID == 255.0)
+    if (matID >= 254.0)
        Idiff += Ispec * spec_emis.x;

    gl_FragColor = vec4(Idiff + Ispec + Iemis, 1.0);
--- a/Textures/Terrain/grass-caribbean.png
+++ b/Textures/Terrain/grass-caribbean.png
--- a/Textures/Terrain/mixedcrop-caribbean.png
+++ b/Textures/Terrain/mixedcrop-caribbean.png
--- a/Textures/Terrain/rainforest-hawaii.png
+++ b/Textures/Terrain/rainforest-hawaii.png
--- a/Textures/buildings-caribbean-lightmap.png
+++ b/Textures/buildings-caribbean-lightmap.png
--- a/Textures/buildings-caribbean.png
+++ b/Textures/buildings-caribbean.png
--- a/Translations/en/menu.xml
+++ b/Translations/en/menu.xml
@ -88,6 +88,8 @@
 	<reload-autopilot>Reload Autopilot</reload-autopilot>
 	<reload-network>Reload Network</reload-network>
 	<reload-model>Reload Aircraft Model</reload-model>
+	<reload-materials>Reload Materials</reload-materials>
+	<reload-scenery>Reload Scenery</reload-scenery>
 	<nasal-console>Nasal Console</nasal-console>
 	<development-keys>Development Keys</development-keys>
 	<configure-dev-extension>Configure Development Extensions</configure-dev-extension>
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@ -247,6 +247,19 @@
 					<row>2</row>
 					<col>0</col>
 					<halign>left</halign>
+					<label>Random buildings</label>
+					<name>random-buildings</name>
+					<property>/sim/rendering/random-buildings</property>
+					<binding>
+						<command>dialog-apply</command>
+						<object-name>random-buildings</object-name>
+					</binding>
+				</checkbox>
+
+				<checkbox>
+					<row>3</row>
+					<col>0</col>
+					<halign>left</halign>
 					<label>Random objects</label>
 					<name>random-objects</name>
 					<property>/sim/rendering/random-objects</property>
@ -257,7 +270,7 @@
 				</checkbox>

 				<checkbox>
-					<row>3</row>
+					<row>4</row>
 					<col>0</col>
 					<halign>left</halign>
 					<label>Random vegetation</label>
@ -269,7 +282,7 @@
 					</binding>
 				</checkbox>
 				<text>
-					<row>3</row>
+					<row>4</row>
 					<col>1</col>
 					<label>density</label>
 					<enable>
@ -277,7 +290,7 @@
 					</enable>
 				</text>
 				<slider>
-					<row>3</row>
+					<row>4</row>
 					<col>2</col>
 					<name>vegetation-density</name>
 					<min>0</min>
@ -290,7 +303,7 @@
 					</binding>
 				</slider>
 				<text>
-					<row>3</row>
+					<row>4</row>
 					<col>3</col>
 					<label>12345678</label>
 					<format>%.1f</format>
@ -301,50 +314,6 @@
 					</enable>
 				</text>
 				
-				<checkbox>
-					<row>4</row>
-					<col>0</col>
-					<halign>left</halign>
-					<label>Random buildings</label>
-					<name>random-buildings</name>
-					<property>/sim/rendering/random-buildings</property>
-					<binding>
-						<command>dialog-apply</command>
-						<object-name>random-buildings</object-name>
-					</binding>
-				</checkbox>
-				<text>
-					<row>4</row>
-					<col>1</col>
-					<label>density</label>
-					<enable>
-						<property>/sim/rendering/random-buildings</property>
-					</enable>
-				</text>
-				<slider>
-					<row>4</row>
-					<col>2</col>
-					<name>building-density</name>
-					<min>0</min>
-					<max>5.0</max>
-					<step>0.1</step>
-					<property>/sim/rendering/building-density</property>
-					<binding>
-						<command>dialog-apply</command>
-						<object-name>building-density</object-name>
-					</binding>
-				</slider>
-				<text>
-					<row>4</row>
-					<col>3</col>
-					<label>12345678</label>
-					<format>%.1f</format>
-					<live>true</live>
-					<property>/sim/rendering/building-density</property>
-					<enable>
-						<property>/sim/rendering/random-buildings</property>
-					</enable>
-				</text>
 			</group>

 			<button>
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@ -552,15 +552,30 @@
 				<command>reinit</command>
 				<subsystem>io</subsystem>
 			</binding>
-        </item>
+		</item>

-        <item>
-            <name>reload-model</name>
-            <binding>
-                <command>reinit</command>
-                <subsystem>aircraft-model</subsystem>
-            </binding>
-        </item>
+		<item>
+			<name>reload-model</name>
+			<binding>
+				<command>reinit</command>
+				<subsystem>aircraft-model</subsystem>
+		        </binding>
+		</item>
+
+		<item>
+			<name>reload-materials</name>
+			<binding>
+				<command>reload-materials</command>
+			</binding>
+		</item>
+
+		<item>
+			<name>reload-scenery</name>
+			<binding>
+				<command>reinit</command>
+				<subsystem>tile-manager</subsystem>
+			</binding>
+		</item>

 		<item>
 			<name>nasal-console</name>