Merge branch 'master' of gitorious.org:fg/fgdata
This commit is contained in:
commit
cbc9f88f50
4 changed files with 16 additions and 11 deletions
|
@ -119,6 +119,11 @@ print("* can disable global weather: "~result);
|
||||||
|
|
||||||
|
|
||||||
print("Compatibility layer: tests done.");
|
print("Compatibility layer: tests done.");
|
||||||
|
|
||||||
|
# do actual startup()
|
||||||
|
local_weather.updateMenu();
|
||||||
|
local_weather.startup();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4621,10 +4621,4 @@ var updateMenu = func {
|
||||||
|
|
||||||
_setlistener("/nasal/local_weather/enabled", updateMenu);
|
_setlistener("/nasal/local_weather/enabled", updateMenu);
|
||||||
|
|
||||||
# wait for Nasal to be available and do what is in startup()
|
|
||||||
|
|
||||||
_setlistener("/nasal/local_weather/loaded", func {
|
|
||||||
updateMenu();
|
|
||||||
startup();
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,7 @@
|
||||||
<enable-ai-models-desc>Enable AI subsystem (required for multi-player, AI traffic and many other animations)</enable-ai-models-desc>
|
<enable-ai-models-desc>Enable AI subsystem (required for multi-player, AI traffic and many other animations)</enable-ai-models-desc>
|
||||||
<disable-ai-traffic-desc>Disable artificial traffic.</disable-ai-traffic-desc>
|
<disable-ai-traffic-desc>Disable artificial traffic.</disable-ai-traffic-desc>
|
||||||
<enable-ai-traffic-desc>Enable artificial traffic.</enable-ai-traffic-desc>
|
<enable-ai-traffic-desc>Enable artificial traffic.</enable-ai-traffic-desc>
|
||||||
|
<disable-ai-scenarios>Disable all AI scenarios.</disable-ai-scenarios>
|
||||||
<ai-scenario>Add and enable a new scenario. Multiple options are allowed.</ai-scenario>
|
<ai-scenario>Add and enable a new scenario. Multiple options are allowed.</ai-scenario>
|
||||||
<disable-freeze-desc>Start in a running state</disable-freeze-desc>
|
<disable-freeze-desc>Start in a running state</disable-freeze-desc>
|
||||||
<enable-freeze-desc>Start in a frozen state</enable-freeze-desc>
|
<enable-freeze-desc>Start in a frozen state</enable-freeze-desc>
|
||||||
|
|
|
@ -232,6 +232,11 @@
|
||||||
<description>strings/enable-ai-traffic-desc</description>
|
<description>strings/enable-ai-traffic-desc</description>
|
||||||
</option>
|
</option>
|
||||||
|
|
||||||
|
<option>
|
||||||
|
<name>disable-ai-scenarios</name>
|
||||||
|
<description>strings/disable-ai-scenarios</description>
|
||||||
|
</option>
|
||||||
|
|
||||||
<option>
|
<option>
|
||||||
<name>ai-scenario</name>
|
<name>ai-scenario</name>
|
||||||
<arg>scenario</arg>
|
<arg>scenario</arg>
|
||||||
|
|
Loading…
Reference in a new issue