fly/flightgear
1
0
Fork 0
Code Activity

Another round of memory leak fixes from Till Busch

Browse source
This commit is contained in:
timoore 2008-01-24 23:05:58 +00:00
parent f754d42fcf
commit 00f8463ab4
8 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/hud.cxx
View file

@ -63,7 +63,7 @@ static HUD_Properties *HUDprop = 0;
static char units[5];
deque<instr_item *> HUD_deque;
deque<SGSharedPtr<instr_item> > HUD_deque;
fgTextList HUD_TextList;
fgLineList HUD_LineList;

2
src/Cockpit/hud.hxx
View file

@ -367,7 +367,7 @@ extern fgLineList HUD_LineList;
extern fgLineList HUD_StippleLineList;
class instr_item { // An Abstract Base Class (ABC)
class instr_item : public SGReferenced { // An Abstract Base Class (ABC)
private:
static UINT instances; // More than 64K instruments? Nah!
static int brightness;

8
src/Instrumentation/HUD/HUD.hxx
View file

@ -23,6 +23,7 @@
#define _HUD_HXX
#include <simgear/compiler.h>
#include <simgear/props/condition.hxx>
#ifdef HAVE_CONFIG_H
# include <config.h>
@ -52,7 +53,6 @@ SG_USING_NAMESPACE(std);
class FGViewer;
class SGCondition;
class LineSegment {
@ -344,7 +344,7 @@ protected:
float _center_x, _center_y;
private:
SGCondition *_condition;
SGSharedPtr<SGCondition> _condition;
float _disp_factor; // Multiply by to get numbers shown on scale.
float _scr_span; // Working values for draw;
int _digits;
@ -370,7 +370,7 @@ private:
float _pointer_width;
float _pointer_length;
SGCondition *_blink_condition;
SGSharedPtr<SGCondition> _blink_condition;
double _blink_interval;
double _blink_target; // time for next blink state change
bool _blink_state;
@ -583,7 +583,7 @@ public:
virtual void draw();
private:
SGCondition *_active_condition; // stadiametric (true) or standby (false)
SGSharedPtr<SGCondition> _active_condition; // stadiametric (true) or standby (false)
Input _diameter; // inner/outer radius relation
float _bullet_size;
float _inner_radius;

1
src/Instrumentation/HUD/HUD_instrument.cxx
View file

@ -24,7 +24,6 @@
#endif
#include <simgear/math/SGLimits.hxx>
#include <simgear/props/condition.hxx>
#include "HUD.hxx"

1
src/Instrumentation/HUD/HUD_label.cxx
View file

@ -23,7 +23,6 @@
# include <config.h>
#endif
#include <simgear/props/condition.hxx>
#include "HUD.hxx"

1
src/Instrumentation/HUD/HUD_misc.cxx
View file

@ -22,7 +22,6 @@
# include <config.h>
#endif
#include <simgear/props/condition.hxx>
#include "HUD.hxx"

3
src/Main/main.cxx
View file

@ -492,9 +492,6 @@ static void fgMainLoop( void ) {
// Do any I/O channel work that might need to be done
globals->get_io()->update( real_delta_time_sec );
// see if we need to load any deferred-load textures
globals->get_matlib()->load_next_deferred();
// Run audio scheduler
#ifdef ENABLE_AUDIO_SUPPORT
if ( globals->get_soundmgr()->is_working() ) {

2
src/Traffic/Schedule.cxx
View file

@ -231,7 +231,7 @@ bool FGAISchedule::update(time_t now)
if (!deptime)
deptime = (*flights.begin())->getDepartureTime();
FGScheduledFlightVecIterator i = flights.begin();
SG_LOG (SG_GENERAL, SG_INFO,"Processing registration " << registration << " with callsign " << (*i)->getCallSign());
SG_LOG (SG_GENERAL, SG_DEBUG,"Processing registration " << registration << " with callsign " << (*i)->getCallSign());
if (AIManagerRef)
{
// Check if this aircraft has been released.