1
0
Fork 0
Commit graph

325 commits

Author SHA1 Message Date
daveluff
3bb349179d Use the Transmit-Render functions for tower output instead of directly calling ATCdisplay. This is part of preparations for optionally handing the strings off to a TTS engine if required. 2004-09-30 15:43:32 +00:00
ehofman
409dee5a9d Remove unnecessary inclusions of sg.h ans ssg.h 2004-09-19 16:33:38 +00:00
ehofman
009afccb37 Reduce the log-level of the airport not found
message.
2004-07-23 18:58:42 +00:00
curt
ec8c167a27 Code at this level shouldn't care if the sound manager is paused or not.
Just forge ahead as if sound is playing, let the sound manger worry about
the details.
2004-05-14 15:49:10 +00:00
curt
944a82b576 Clean up some sound buffer allocation/deallocation issues. 2004-05-10 21:24:30 +00:00
andy
7ceb85d454 Changes to get FlightGear (well, the src directory at least) to
configure and compile out-of-the-box on a MinGW target:

Use -lSDL instead of -lglut32 on windows builds when --enable-sdl
is set.

Link against alut.dll in addition to openal32.dll.

Replace BSD bcopy() with ANSI C memmove() in a few places.  This is
simpler than trying to abstract it out as a platform dependency in a
header file; bcopy() has never been standard.

The ENABLE_THREADS handling has changed to be set to 0 when threads
are not in use.  This breaks expressions like #ifdef ENABLE_THREADS.
Replace with a slightly more complicated expression.  It might have
been better to fix the configure.ac script, but I didn't know how and
this whole setting is likely to go away soon anyway.

The MinGW C runtime actually does include snprintf, so only MSVC
builds (and not all WIN32 ones) need _snprintf in JSBSim/FGState.cpp

Building on a platform with no glut at all exposed some spots where
plib/pu.h was being included without a toolkit setting (it defaults to
glut).  Include fg_os.hxx first.

And when still using glut, glut.h has a bizarre dependency on a
_WCHAR_T_DEFINED symbol.  It it's not defined, it tries to redefine
(!!) wchar_t to disasterous effect.
2004-04-30 00:52:11 +00:00
curt
0483333a6b Get ATIS voice working again. 2004-04-26 22:02:30 +00:00
curt
df472fe0f5 Changes to go along with small interface changes in simgear/sound/libsgsound
(which is now written on top of OpenAL.)
2004-04-24 19:28:12 +00:00
daveluff
7019fcdc15 Fix a seg fault that could be caused if all no AI models were in existance. Ssg could then free the memory pointed to by our pointer behind our back, causing it to crash when next approaching a controlled airport requiring an AI model. Fix is to hold one ref to each model in the AIMgr at all times. 2004-04-11 15:20:36 +00:00
ehofman
34b0b5220c Windows fix. 2004-04-06 14:25:33 +00:00
andy
941f99308d Oops. A change to an upstream header seems to have remove glu.h, which
these files require.  Dunno why my build didn't pick up the transitive
dependency.
2004-04-06 03:51:11 +00:00
andy
c0b4531d04 Yank out all the glut dependencies and concentrate them in a (easily
reimplementable) Main/fg_os.cxx file.
2004-03-31 21:10:32 +00:00
daveluff
e1d1bdc1da A few abs->fabs where we are passing a double in 2004-03-29 10:25:21 +00:00
daveluff
0bea768f24 Patch from Fred Bouvier to use multi-platform ul library from plib for directory searching instead of ifdefs 2004-03-29 10:20:19 +00:00
daveluff
e8ccfb6d20 Round millibars to nearest whole number, and make inches default even in UK until the altimeter on the panel gets a millibar adjuster 2004-03-24 00:28:52 +00:00
daveluff
b6d30b7224 Convert altimeter to millibars for the UK 2004-03-23 23:36:27 +00:00
daveluff
a8b25e57ff Add altimeter to the ATIS. Always does inches at the moment. 2004-03-23 23:25:37 +00:00
daveluff
22d8f5a72c Fix another possible ATC stackdump 2004-03-22 22:09:47 +00:00
daveluff
7e395b47b7 Fix some warnings 2004-03-22 20:57:27 +00:00
daveluff
e2c4a83040 Some more tweaks to the landing clearance code 2004-03-20 04:12:05 +00:00
daveluff
db2ef57049 Delay deletion of AI traffic until after it has had time to release the frequency after its last transmission. This is a bit of a band-aid for more deep-seated problems with the dialog model, but it will solve some problems for now 2004-03-20 03:13:29 +00:00
daveluff
80761c515e Release the frequency after finishing a transmission 2004-03-20 02:56:13 +00:00
daveluff
fc36c51e89 Slightly more robust handling of runway vacation 2004-03-20 02:55:25 +00:00
daveluff
4d25095e76 Convert some char* return types to string 2004-03-19 13:46:15 +00:00
david
25290c4467 Remove the old WeatherCM module. 2004-03-16 20:19:07 +00:00
daveluff
738b81dc49 Fix a possible crash 2004-03-16 10:35:29 +00:00
daveluff
1347ca930f Work around for the AI-traffic due to precision issues generated by the radio frequency dialog 2004-03-15 11:14:03 +00:00
daveluff
ead3dd3d5c Don't clear the user to land following downwind report if there is other traffic on final to land first - instruct the user to follow the other traffic and clear the user to land once the other traffic is clear of the runway instead. 2004-03-12 15:59:14 +00:00
daveluff
9e968eaec7 Fix a situation where the AI aircraft sometimes wouldn't be visible when they should 2004-03-12 15:58:00 +00:00
daveluff
7a044b3faa Start adding a better framework for ATC-initiated communication. There should be no user-visible change from this commit 2004-03-10 16:01:17 +00:00
daveluff
1e3a4f312b Add an option for the user to inform the tower (s)he is going around after downwind or final has been reported 2004-03-09 16:20:55 +00:00
daveluff
82ec72da84 Start making the AI traffic robust to not getting a tower pointer from ATC. Eventually this should also lead to being able to generate AI traffic at uncontrolled airports 2004-03-06 14:44:38 +00:00
daveluff
4c84d11862 Use the airport elevation instead of the actual ground elevation when out of visible range of the user. This should reduce thrashing / pollution of the tile cache. 2004-03-05 16:24:04 +00:00
daveluff
f8ef6d16b4 Fix a crash that sometimes occurred when reporting downwind in the circuit 2004-03-05 12:34:08 +00:00
daveluff
406c7d7042 Fix a problem where track would not get initialised to a sensible value before getting altered 2004-03-04 10:11:29 +00:00
daveluff
9773ba5542 Move the mechanics of turning out of the derived classes into AIPlane. The user-visible effect is that AI planes no longer suddenly change direction without turning properly. 2004-03-02 10:43:16 +00:00
daveluff
cb8db7725a Don't cast string to c_str before passing to functions that take string, and remove an inadvertant push onto the airport_atc_map of data that already exists on it 2004-03-02 10:37:38 +00:00
daveluff
e4859c1fbf Return the closest match instead of the first in-range match when searching by frequency 2004-03-01 13:49:47 +00:00
daveluff
dcf8d93852 Make sure at least one Transform() is performed to set the model position *before* first calling DoGroundElev() in order to avoid polluting the tilemgr with bogus tiles 2004-02-04 17:00:19 +00:00
daveluff
129a9fabe2 Oops - no 3D model assigned to aircraft starting at airports with logical networks 2004-02-04 16:59:04 +00:00
ehofman
4fb5e61162 MSVC fixes 2004-01-26 20:06:03 +00:00
daveluff
845ba951e4 Melchior found another way to crash it 2004-01-23 18:38:02 +00:00
daveluff
a739fad664 Lots of changes to the ATC/AI system for initial revision of random AI GA VFR traffic 2004-01-23 17:18:24 +00:00
daveluff
afb654a068 Initial revision of class for AI VFR GA traffic 2004-01-23 17:16:15 +00:00
daveluff
4fa02012dc Don't loose the elevation in ATC projection conversions 2004-01-23 17:14:08 +00:00
andy
439a9fa1e4 Minor API changes to support the new sg_geodesy implementation. A few
places now use sgCartToGeod() instead of rolling their own
approximation.  And YASim is now using exactly the same 3D coordinate
system as the rest of FlightGear is.
2003-12-19 02:42:32 +00:00
david
d296e5a7df Use proper logging facility, and lower the priority of some of the
logging messages.  This is part of an effort to make FlightGear a bit
quieter during normal operations.
2003-11-24 17:45:35 +00:00
daveluff
a8c7af79ab Fix a nasty bug whereby non-scrolling ATC messages longer than the screen width were not rendered at all. They are now rendered with the end clipped - that can be fixed later. 2003-11-19 10:16:26 +00:00
ehofman
f3bb344f4e MSVC fix 2003-11-14 09:41:31 +00:00
ehofman
e6cd7a0ed7 Add Manuel Bessler and Stephen Lowry's remote joystick code and add David Magginson's 3dconvert utility 2003-11-12 10:06:18 +00:00
daveluff
e77a6e4d3d Re-commit the changes that I inadvertantly committed as cvsguest 2003-11-09 14:01:50 +00:00
curt
e07b153321 Someone managed to commit changes as cvsguest, return to the original
version.  These changes need to be added via the proper channels.
2003-11-09 00:46:56 +00:00
daveluff
430a44a803 Further progress towards interactive ATC 2003-11-05 17:24:58 +00:00
daveluff
6162d4462b Further progress towards interactive ATC control 2003-11-05 10:06:57 +00:00
cvsguest
f4b3bad58e Fix a nasty bug - FGATC::SetDisplay() should be called *after* FGATC::Init() since display is often initialised to false in the init routine. Also some other bits and pieces. 2003-11-05 10:02:34 +00:00
cvsguest
c2983d61bc Set the message display delay to default to zero 2003-11-05 10:00:46 +00:00
daveluff
29fa5ce8ec Fix a typo in the comments 2003-11-04 12:00:36 +00:00
daveluff
a5014c67a8 Start supporting user interaction callbacks and tweak the circuit eta calculation 2003-11-04 12:00:14 +00:00
daveluff
ed2e58d230 Rationalisation of the ATC popup dialog code - moved it all over to AK's dynamic list system and removed the hardcoded list code, extended the dynamic list system a bit, started adding support for callbacks from the user interaction 2003-11-04 11:54:42 +00:00
daveluff
8e904eb882 Cleaned up the ATC communication dialog code somewhat 2003-10-22 10:50:11 +00:00
daveluff
3d104940e9 Fixed up the freqency search dialogs properly - this should eliminate crashing and memory leakage 2003-10-21 11:44:43 +00:00
daveluff
2454446233 Fix a crash from the ATC Frequency dialog at the temporary expense of a small memory leak 2003-10-20 21:48:57 +00:00
daveluff
0adae696aa AI plane should go around instead of landing on user if user dawdles on runway now 2003-10-19 20:38:08 +00:00
daveluff
cd08f83aa5 Ug - must have been drunk when committing those two de-align lines! - this one works 2003-10-19 19:38:01 +00:00
daveluff
90c0f80b9a Quick hack to prevent offering an option that isn't implemented yet 2003-10-17 18:56:29 +00:00
daveluff
81c252e40e Remove some extraneous output, add a few comments, tidy a bit of formatting 2003-10-17 09:56:35 +00:00
daveluff
a28bf4d9ea Enhancements to AI plane transmissions 2003-10-17 00:31:47 +00:00
daveluff
2666ce81d9 Bug fixes to the AI/ATC interaction mechanism 2003-10-17 00:31:07 +00:00
cvsguest
8308d47e8d Report Final to tower control class in addition to displaying it 2003-10-16 16:06:54 +00:00
cvsguest
f742186633 Clear AI plane to land when it calls final if rwy clear 2003-10-16 16:06:22 +00:00
ehofman
0e370e6e28 Fix a problem where older IRIX compilers needed a typecast for certain opperations 2003-10-16 14:14:03 +00:00
daveluff
7105d2029a Remove some cruft, and add a short TODO list 2003-10-16 11:28:44 +00:00
daveluff
0cb2aeffbd Bug fix: derived classes were never getting a chance to respond to the towers landing intention query properly 2003-10-16 11:12:37 +00:00
daveluff
de24524acb Transmit an empty string in order to trigger AI/ATC interation mechanism. TODO - transmit the correct phraseology. 2003-10-15 21:51:12 +00:00
daveluff
d0d70bebd7 Move responding to a plane announcing itself at hold short over to the response mechanism. Beware that a particularly nasty assumption that only one plane is ever holding for the runway at once remains for now though. 2003-10-15 21:50:05 +00:00
daveluff
ca766f9aac Use MHz when stating freqency on-air and call the base class update for response time handling 2003-10-15 14:11:50 +00:00
daveluff
3610b0235c Tweaks to use the ATC/AI interaction framework and respond to downwind report with position in circuit 2003-10-15 14:10:30 +00:00
daveluff
c76dd941f4 Tweaks to use the ATC/AI interaction framework 2003-10-15 14:09:26 +00:00
daveluff
d5d9723d9b Tweaks to the ATC/AI interaction framework 2003-10-15 14:06:28 +00:00
daveluff
6d1418ff12 Refactoring - no actual change 2003-10-14 11:10:17 +00:00
daveluff
6769d7974c Display AI plane transmissions if comm2 is tuned to the same frequency 2003-10-14 11:09:10 +00:00
daveluff
331954ff6f Tidy the recent freq display code somewhat 2003-10-13 11:30:40 +00:00
daveluff
800510ed58 Fixed a bug where an ATC station on one channel wouldn't stop transmitting when deselected if another type of ATC at the same airport was tuned on the other channel 2003-10-11 18:10:28 +00:00
daveluff
eb0b8ad47c Add a constant holding the number of different ATC types 2003-10-11 18:08:45 +00:00
daveluff
497559f2ba Clarification of function comments in header file 2003-10-10 15:14:09 +00:00
daveluff
d43b6fd508 Added ATC frequency lookup dialog 2003-10-10 15:13:16 +00:00
daveluff
9e66194dca Fix a possible endless loop due to insufficient space in a char array for some messages 2003-10-09 21:37:26 +00:00
daveluff
9d3d4ecc51 Missed a cout 2003-10-09 12:12:09 +00:00
daveluff
70cd48b5b1 A few bug fixes to Alexanders approach vectoring code to get it to work and display instructions 2003-10-09 11:54:09 +00:00
daveluff
2d89960a20 Reformat a function to get rid of tab-space mixture and remove some old commented out code that now lives in ATCDialog.cxx 2003-10-09 11:53:28 +00:00
daveluff
f8d1a58d64 Don't do AreaSearch in ATCmgr since nothing really needs it at the moment plus a couple of bug fixes to frequency search handling of approach 2003-10-09 11:52:42 +00:00
daveluff
b84cf7c3af Oops - a boo boo of monumental proportions completely took ATC off the air... 2003-10-07 16:05:20 +00:00
daveluff
824f78f255 Formatting changes 2003-10-07 13:01:18 +00:00
daveluff
1a2ee0a908 Remove unimplemented options from the ATC dialog for now 2003-10-07 12:26:28 +00:00
daveluff
c89ea44131 Further progress towards AI/ATC dialog 2003-10-06 22:40:37 +00:00
daveluff
380c69c8a0 Progress towards AI/ATC communication without speaking all at once 2003-10-06 15:20:47 +00:00
daveluff
ea0751eaa2 Minor formatting changes 2003-10-06 15:19:42 +00:00
daveluff
62854c99a6 Removed some extraneous output 2003-10-06 14:09:59 +00:00
ehofman
980012e168 Move FGEventMgr and FGSubsystemMgr over to SimGear, add SGEventMgr to FlightGear's globals structre and some small code cleanups 2003-09-24 17:20:55 +00:00
daveluff
56a0477f76 Fix a nasty bug whereby the AI plane would descend far too early on the circuit following a touch-and-go 2003-09-23 21:01:02 +00:00