1
0
Fork 0
Commit graph

98 commits

Author SHA1 Message Date
ThorstenB
8962477cfa Fix huge multiplayer memory leak.
Almost all FGPropertyData elements received via MP were leaked.
Property data is now cleanly deallocated in the FGExternalMotionData destructor.
Thanks to Jester for reporting rising mem consumption in MP mode.
2011-02-16 00:49:00 +01:00
ThorstenB
5268b3c6ed Report stopped MP transmission at higher log level,
it's too important to be a "debug only" message.
2011-01-23 15:24:28 +01:00
ThorstenB
feab53b462 Added sanity checks to MP receive/send.
Stop invalid data (NaN values) from being sent or received via MP.
2011-01-23 15:07:09 +01:00
James Turner
a91ec5f9f9 Initial work on CMake build files, with considerable help from Olaf Flebbe. 2010-12-19 15:06:04 +00:00
ThorstenB
da32e9332c Freeze MP position during replay.
Now you can replay and watch your favourite landing
101 times without pi**ing off everyone else playing MP. :)
2010-11-15 23:28:51 +01:00
Christian Schmitt
0a5e86f4e6 remove old .cvsignore files 2010-11-11 01:16:29 +01:00
James Turner
0e53e2cbb1 PLIB net removed from FlightGear 2010-10-24 07:10:51 +01:00
James Turner
94a3471956 Merge commit 'refs/merge-requests/7' of git://gitorious.org/fg/flightgear into topics/merge7 2010-10-19 09:05:51 +01:00
James Turner
0c342308eb Make MultiPlayer a well-behaved subsystem. 2010-10-05 23:17:32 +01:00
Thorsten Brehm
c71fcbf10d Simplified pointer-aliasing patch.
Removed introduction of a new union and reused existing one.
2010-09-28 08:50:54 +02:00
Thorsten Brehm
5a7f838ff2 Fixed all type-casts violating the strict-aliasing rule.
=> Removes compiler warnings and optimization problems.
2010-09-27 23:48:20 +02:00
Csaba Halasz
fdbfd6fd0b Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next
Conflicts:

	src/MultiPlayer/multiplaymgr.cxx
2010-09-09 00:48:17 +02:00
Anders Gidenstam
a9062080b0 Restored line endings in src/MultiPlayer/multiplaymgr.cxx.
Please check that the line endings are not messed up before mergeing.
2010-09-02 20:07:34 +02:00
Vivian Meazza
9018d65c52 Add contrail as a standard property
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-09-02 09:25:53 +01:00
Vivian Meazza
792cb2701f Add tanker property to list of standard properties
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2010-08-30 17:16:30 +01:00
Mathias Froehlich
721ae71cd7 Use simgear abstraction instead of directly osg for the AIBase class. 2010-06-16 07:00:18 +02:00
Tim Moore
63434ceef8 Merge branch 'timoore/fire-fix' into next 2010-03-05 18:17:39 +01:00
Tim Moore
b88fa3e1bf add back wildfire multiplayer property
This was deleted by accident when I moved property types to their own
namespace.
2010-03-05 18:17:19 +01:00
V Meazza
3492c681cb Change Log Message status from ALERT to DEBUG
Signed-off-by: V Meazza <vivian.meazza@lineone.net>
2010-02-14 19:25:12 +01:00
Tim Moore
be4b46b894 change back unsigned byte count to signed (multiplaymgr)
Also, small fixes to generic protocol from AndersG
2009-08-27 00:12:44 +02:00
Tim Moore
5b29cd4cc0 fix warnings in Multiplayer, Scripting, and Time 2009-08-24 18:07:19 +02:00
Tim Moore
7d6c567fde Refer to property types using props:: namespace
BOOL, FLOAT etc. conflict with typedefs in windows.h.
2009-07-17 14:54:12 +02:00
timoore
4cc3084256 SGPropertyNode::Type moves to simgear::props namespace 2009-07-16 12:10:47 +02:00
fredb
97c214e4fc Suppress warnings 2009-06-15 10:29:45 +02:00
mfranz
5b32c9ab1c degrade MP chat messages from SG_ALERT fo SG_WARN
(they should not drown real error messages)
2009-04-01 09:23:54 +02:00
frohlich
a99ea1c7b5 Port over remaining Point3D usage to the more type and unit safe SG* classes.
Remove leftover headers from plib/sg.

Modified Files:
 	src/AIModel/AIBase.cxx
 	src/AIModel/AIFlightPlanCreateCruise.cxx
 	src/ATCDCL/AIEntity.cxx src/ATCDCL/AIEntity.hxx
 	src/ATCDCL/AIGAVFRTraffic.cxx src/ATCDCL/AIGAVFRTraffic.hxx
 	src/ATCDCL/AILocalTraffic.cxx src/ATCDCL/AILocalTraffic.hxx
 	src/ATCDCL/AIMgr.cxx src/ATCDCL/ATC.hxx
 	src/ATCDCL/ATCDialog.cxx src/ATCDCL/ATCProjection.cxx
 	src/ATCDCL/ATCProjection.hxx src/ATCDCL/ATCutils.cxx
 	src/ATCDCL/ATCutils.hxx src/ATCDCL/approach.cxx
 	src/ATCDCL/commlist.cxx src/ATCDCL/ground.cxx
	src/ATCDCL/ground.hxx src/ATCDCL/tower.cxx
 	src/ATCDCL/tower.hxx src/Airports/calc_loc.cxx
 	src/Airports/dynamics.cxx src/Airports/groundnetwork.cxx
 	src/Airports/parking.cxx src/Airports/runwayprefs.cxx
 	src/Airports/simple.cxx src/Cockpit/cockpit.cxx
 	src/Cockpit/hud.hxx src/Cockpit/hud_card.cxx
 	src/Cockpit/hud_rwy.cxx src/Environment/environment.cxx
 	src/FDM/UFO.cxx src/FDM/SP/MagicCarpet.cxx src/GUI/dialog.hxx
 	src/Instrumentation/HUD/HUD.hxx
 	src/Instrumentation/HUD/HUD_runway.cxx
 	src/Instrumentation/KLN89/kln89.cxx src/Main/fg_init.cxx
 	src/Main/viewer.cxx src/Main/viewmgr.cxx
 	src/Model/panelnode.cxx src/MultiPlayer/mpmessages.hxx
 	src/Scenery/tilemgr.cxx src/Traffic/SchedFlight.cxx
 	src/Traffic/TrafficMgr.cxx
2009-03-18 08:00:08 +01:00
frohlich
f9f9350b96 Adapt to SGTimeStamp changes.
Modified Files:
	configure.ac src/Cockpit/panel.cxx src/FDM/Makefile.am
	src/FDM/flight.hxx src/FDM/ExternalNet/ExternalNet.hxx
	src/Instrumentation/marker_beacon.cxx src/Main/Makefile.am
	src/Main/fg_init.cxx src/Main/main.cxx
	src/MultiPlayer/multiplaymgr.cxx src/Time/fg_timer.cxx
	utils/GPSsmooth/MIDG_main.cxx utils/GPSsmooth/UGear_main.cxx
	utils/GPSsmooth/gps_main.cxx
2009-03-18 08:00:08 +01:00
Tim Moore
157eb857ef Merge branch 'topic/multiplayer' into next 2009-02-06 12:18:09 +01:00
Tim Moore
0cbfd8bdb5 MP cleanup
Expand the message union to provide member functions that return pointers into
the message buffer.
2009-02-06 11:59:40 +01:00
Tim Moore
e83caa6321 Fix various mp bugs.
In multiplaymgr.cxx:
The length of a string property that is too big was written out in the message
even though the string was truncated. Also, it was possible to overrun the
message buffer.

In incoming  messages, null-terminate the callsign to prevent any funny
business. Don't believe invalid string lengths. Turn the warning about unknown
properties from a warning into info; there are too many buggy clients out there,
not to mention people who add their own MP properties (hi vivian :)
2009-02-06 08:50:14 +01:00
Tim Moore
8a756eee54 Merge branch 'maint' into next 2009-01-15 16:16:08 +01:00
Tim Moore
45194f8e81 Pad T_PositionMsg to a multiple of 8 bytes, and check for messages that aren't.
T_PositionMsg had different sizes on 32 and 64 bit systems, which is bad when
a struct is put directly into an network message.

Try to work around this difference in old clients still on the network.
2009-01-15 16:03:34 +01:00
Tim Moore
e108eddc22 FGMultiplayMgr: use binary search to find a property by id 2009-01-15 13:05:23 +01:00
mfranz
cd4b05909d add property for wildfire propagation 2009-01-12 13:04:52 +01:00
mfranz
5a3f00bcac add some more generic multiplay properties (now 20 of each type; was 10) 2008-11-12 14:53:03 +00:00
mfranz
30b8cde4c0 add surface-positions/wing-pos-norm, surface-positions/wing-fold-pos-norm 2008-10-09 16:13:50 +00:00
durk
301054204e James Turner: Improved runway management code:
- Runways are now part of an airport, instead of a separate list
 - Runways are no longer represented as a boring struct, but as a class
   of their own.
 -Improved runway access to unify various runway access methods.
2008-08-14 18:13:39 +00:00
ehofman
667e64e1eb - remove the SG_GLxxxx_H #defines, since OSG provides its own versions
- this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
   extensions.hxx was pulling in all of Carbon to the global namespace
   - very scary. As a result, I now need to explicitly include CoreFoundation
   in fg_init.cxx.
 - change SG_USING_STD(x) to using std::x
2008-07-27 16:25:13 +00:00
ehofman
d9bfd5a425 This should apply, and everything should build cleanly, in isolation from the
SimGear change. It changes all the SG_xxxx to be the 'real' includes, and gets
rid of many #ifdef SG_HAVE_STD_INCLUDES. As an added bonus, rather than
replacing 'SG_USING_NAMESPACE(std)' with 'using namespace std', I just fixed
the small number of places to use std:: explicitly. So we're no longer polluting
the global namespace with the entire contents of std, in many cases.

There is one more 'mechanical' change to come - getting rid of SG_USING_STD(X),
but I want to keep that separate from everything else. (There's another
mechnical change, replacing <math.h> with <cmath> and so on *everywhere*, but
one step at a time)
2008-07-25 18:38:29 +00:00
mfranz
c9d2243960 Anders GIDENSTAM: "only override the receive port when it isn't set already" 2008-06-03 15:57:33 +00:00
durk
9416c13477 Small patch that prevents displaying a "local echo" of one's own aircraft
under some circumstances. The history of this patch is somewhat unclear,
but was brought to my attention by Martin Spott, while preparing for the
Lelystad FSWeekend show. See also my posting on FlightGear devel, on
November 22, 2007 "(Multiplayer Local Echo Patch)", but wasn't committed
then because I/we assumed that had been superseded by other code
modifications. The local echo problem still persists, however, albeit
under specific circumstances. The current patch reportedly prevents this
from happening.
2008-04-19 10:42:06 +00:00
timoore
fd492a297a model paging patch from Till Busch
From Till:
i started the project at the end of february with a simple idea: move all
3d-model loading to the DatabasePager-thread. my first attempts looked
promising, though they were a little too optimistic (or naive?). the patch
has evolved a lot since.

currently it does the following things:
1. revive SGModelLib, move functions for xml-model-loading there

2. replace all calls to sgLoad3dModel with calls to either
SGModelLib::loadModel() or SGModelLib::loadPagedModel()
almost all models will be loaded by the DatabasePager. the few exceptions are:
your own plane, shared models in scenery, random objects, AIBallistic models.

3. simplify mode-loading functions (avoid passing around fg_root)

4. avoid supurious MatrixTransform nodes in loaded models

5. fix some memory leaks
2008-03-22 09:31:06 +00:00
mfranz
24277bf0c0 add /sim/model/livery/file for internal use in the aircraft.livery class;
This is meant to contain the basename of a livery file in the livery dir.
2008-02-29 16:13:02 +00:00
mfranz
603778eb1e add some generic properties for free use 2007-12-08 09:49:16 +00:00
timoore
d6c97951ca Check for valid multiplayer packet.
Instead of just reporting that the magic number, length, etc. of a
multiplayer packet is invalid, abort processing this packet. Also,
check if enough space remains to send a property string.
2007-12-07 12:43:42 +00:00
durk
ba3f716c86 Fix tiny memory leak, as reported by Valgrind. 2007-10-02 16:14:16 +00:00
mfranz
5246e4541f Transfer a variant index of type integer. What the number means is
determined by the aircraft. This allows to let an aircraft appear in
the same livery/variant on all machines which the pilot chose.
2007-09-29 18:21:35 +00:00
andy
a408d248ad vivian: add misc. MP properties 2007-08-27 20:58:14 +00:00
mfranz
415fa8332a Maik JUSTUS: adapt some property names to match common style 2007-01-17 22:29:20 +00:00
mfranz
6d2789816b Maik JUSTUS: aerotowing properties 2007-01-17 20:44:42 +00:00