From: mfranz Date: Mon, 5 Jun 2006 20:21:45 +0000 (+0000) Subject: make fontcache globally available X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d5fd30249f2ee92d6c1efab64941599b29c60fde;p=flightgear.git make fontcache globally available --- diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx index e914bce09..9770d0d08 100644 --- a/src/Main/globals.cxx +++ b/src/Main/globals.cxx @@ -28,6 +28,8 @@ #include #include +#include + #include "globals.hxx" #include "renderer.hxx" #include "viewmgr.hxx" @@ -80,6 +82,7 @@ FGGlobals::FGGlobals() : scenery( NULL ), tile_mgr( NULL ), io( new FGIO ), + fontcache ( new FGFontCache ), navlist( NULL ), loclist( NULL ), gslist( NULL ), @@ -102,6 +105,7 @@ FGGlobals::~FGGlobals() delete props; delete commands; delete io; + delete fontcache; delete renderer; delete initial_waypoints; } diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx index cc8f280fb..e1cef63dd 100644 --- a/src/Main/globals.hxx +++ b/src/Main/globals.hxx @@ -85,6 +85,7 @@ class FGTileMgr; class FGViewMgr; class FGViewer; class FGRenderer; +class FGFontCache; /** @@ -197,6 +198,8 @@ private: // Input/Ouput subsystem FGIO *io; + FGFontCache *fontcache; + // Navigational Aids FGNavList *navlist; FGNavList *loclist; @@ -350,6 +353,7 @@ public: inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; } inline FGIO* get_io() const { return io; } + inline FGFontCache *get_fontcache() const { return fontcache; } inline FGNavList *get_navlist() const { return navlist; } inline void set_navlist( FGNavList *n ) { navlist = n; }