Merge branch 'curt/replay' into next
This commit is contained in:
commit
b587400846
1 changed files with 6 additions and 6 deletions
|
@ -142,17 +142,17 @@ void FGReplay::update( double dt ) {
|
||||||
timingInfo.clear();
|
timingInfo.clear();
|
||||||
stamp("begin");
|
stamp("begin");
|
||||||
static SGPropertyNode *replay_master
|
static SGPropertyNode *replay_master
|
||||||
= fgGetNode( "/sim/freeze/replay", true );
|
= fgGetNode( "/sim/freeze/replay-state", true );
|
||||||
|
|
||||||
if( disable_replay->getBoolValue() ) {
|
if( disable_replay->getBoolValue() ) {
|
||||||
if( sim_time != 0.0 ) {
|
if ( sim_time != 0.0 ) {
|
||||||
// we were recording data
|
// we were recording data
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//stamp("point_01");
|
//stamp("point_01");
|
||||||
if ( replay_master->getBoolValue() ) {
|
if ( replay_master->getIntValue() > 0 ) {
|
||||||
// don't record the replay session
|
// don't record the replay session
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -177,9 +177,9 @@ void FGReplay::update( double dt ) {
|
||||||
r = new FGReplayData;
|
r = new FGReplayData;
|
||||||
stamp("Replay_02");
|
stamp("Replay_02");
|
||||||
} else {
|
} else {
|
||||||
r = recycler.front();
|
r = recycler.front();
|
||||||
recycler.pop_front();
|
recycler.pop_front();
|
||||||
//stamp("point_04be");
|
//stamp("point_04be");
|
||||||
}
|
}
|
||||||
r->sim_time = sim_time;
|
r->sim_time = sim_time;
|
||||||
//r->ctrls = c;
|
//r->ctrls = c;
|
||||||
|
|
Loading…
Reference in a new issue