From: ThorstenB Date: Mon, 30 Apr 2012 17:44:11 +0000 (+0200) Subject: #248: support enabling AI module at run-time X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=38ca3dda606218369c6a599ddbd5cf2f5c8069d3;p=flightgear.git #248: support enabling AI module at run-time Traffic manager can also be enabled at run-time, so "ai enabled" check also needs to be moved for traffic. --- diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx index a8426b80c..bfcb732fd 100644 --- a/src/Traffic/TrafficMgr.cxx +++ b/src/Traffic/TrafficMgr.cxx @@ -138,12 +138,6 @@ void FGTrafficManager::init() return; } - if (!aiEnabled) - { - // traffic depends on AI module - aiEnabled = true; - } - assert(!doingInit); doingInit = true; if (string(fgGetString("/sim/traffic-manager/datafile")) == string("")) { @@ -267,10 +261,16 @@ void FGTrafficManager::loadHeuristics() void FGTrafficManager::update(double /*dt */ ) { - if (!enabled || !aiEnabled || (realWxEnabled && !metarValid)) { + if (!enabled || (realWxEnabled && !metarValid)) { return; } - + + if (!aiEnabled) + { + // traffic depends on AI module + aiEnabled = true; + } + if (!inited) { if (!doingInit) { init();