~ubuntu-branches/ubuntu/oneiric/flightgear/oneiric

« back to all changes in this revision

Viewing changes to src/Main/globals.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-01-05 12:48:11 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060105124811-xsr6rtcrb88w19c8
Tags: 0.9.9-1ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
// along with this program; if not, write to the Free Software
19
19
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20
20
//
21
 
// $Id: globals.cxx,v 1.34 2004/11/19 22:10:43 curt Exp $
 
21
// $Id: globals.cxx,v 1.38 2005/10/22 11:22:06 ehofman Exp $
22
22
 
 
23
#ifdef HAVE_CONFIG_H
 
24
#  include <config.h>
 
25
#endif
23
26
 
24
27
#include <simgear/sound/soundmgr_openal.hxx>
25
28
#include <simgear/structure/commands.hxx>
26
29
#include <simgear/misc/sg_path.hxx>
27
30
 
28
31
#include "globals.hxx"
 
32
#include "renderer.hxx"
29
33
#include "viewmgr.hxx"
30
34
 
31
35
#include "fg_props.hxx"
81
85
    gslist( NULL ),
82
86
    dmelist( NULL ),
83
87
    mkrlist( NULL ),
 
88
    tacanlist( NULL ),
 
89
    carrierlist( NULL ), 
84
90
    fixlist( NULL )
85
91
{
86
92
}
97
103
    delete commands;
98
104
    delete io;
99
105
    delete renderer;
100
 
  
101
 
    // make sure only to delete the initial waypoints list if it acually
102
 
    // still exists. 
103
 
    if (initial_waypoints)
104
 
        delete initial_waypoints;
 
106
    delete initial_waypoints;
105
107
}
106
108
 
107
109