fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'topics/bug141' into next

Browse source
This commit is contained in:
James Turner 2010-07-13 20:50:17 +01:00
commit 93c6d15e19
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Aircraft/replay.cxx
View file

@ -163,7 +163,7 @@ void FGReplay::update( double dt ) {
//FGProps2NetFDM( &f, false );
// sanity check, don't collect data if FDM data isn't good
if (!fgGetBool("/sim/signals/fdm-initialized", false)) {
if (!fgGetBool("/sim/fdm-initialized", false)) {
return;
}

4
src/FDM/fdm_shell.cxx
View file

@ -68,13 +68,14 @@ FDMShell::~FDMShell()
void FDMShell::init()
{
_props = globals->get_props();
fgSetBool("/sim/fdm-initialized", false);
createImplementation();
}
void FDMShell::reinit()
{
if (_impl) {
fgSetBool("/sim/signals/fdm-initialized", false);
fgSetBool("/sim/fdm-initialized", false);
evil_global_fdm_state = NULL;
_impl->unbind();
delete _impl;
@ -122,6 +123,7 @@ void FDMShell::update(double dt)
_impl->bind();
evil_global_fdm_state = _impl;
fgSetBool("/sim/fdm-initialized", true);
fgSetBool("/sim/signals/fdm-initialized", true);
}
}

2
src/Main/main.cxx
View file

@ -427,7 +427,7 @@ static void fgMainLoop( void ) {
// END Tile Manager udpates
if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
&& fgGetBool("sim/signals/fdm-initialized")) {
&& fgGetBool("sim/fdm-initialized")) {
fgSetBool("sim/sceneryloaded",true);
if (fgGetBool("/sim/sound/working")) {
globals->get_soundmgr()->activate();