fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Curtis L. Olson 2011-11-14 15:55:25 -06:00
commit 3db471f83a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ATCDCL/ATCmgr.cxx
View file

@ -52,6 +52,7 @@ FGATCMgr::FGATCMgr() :
} }
FGATCMgr::~FGATCMgr() { FGATCMgr::~FGATCMgr() {
globals->set_ATC_mgr(NULL);
delete v1; delete v1;
} }

2
src/Time/TimeManager.cxx
View file

@ -331,7 +331,7 @@ void TimeManager::setTimeOffset(const std::string& offset_type, long int offset)
} else if ( offset_type == "noon" ) { } else if ( offset_type == "noon" ) {
warp = fgTimeSecondsUntilSunAngle( cur_time, lon, lat, 0.0, true ); warp = fgTimeSecondsUntilSunAngle( cur_time, lon, lat, 0.0, true );
} else if ( offset_type == "afternoon" ) { } else if ( offset_type == "afternoon" ) {
warp = fgTimeSecondsUntilSunAngle( cur_time, lon, lat, 60.0, false ); warp = fgTimeSecondsUntilSunAngle( cur_time, lon, lat, 75.0, false );
} else if ( offset_type == "dusk" ) { } else if ( offset_type == "dusk" ) {
warp = fgTimeSecondsUntilSunAngle( cur_time, lon, lat, 90.0, false ); warp = fgTimeSecondsUntilSunAngle( cur_time, lon, lat, 90.0, false );
} else if ( offset_type == "evening" ) { } else if ( offset_type == "evening" ) {