fly/flightgear
1
0
Fork 0
Code Activity

Fix a typo.

Browse source
This commit is contained in:
James Turner 2012-09-25 10:07:11 +01:00
parent 649d579124
commit 9426928cdf
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Canvas/elements/CanvasImage.cxx
View file

@ -291,7 +291,7 @@ namespace canvas
} }
else else
{ {
SGPath tpath = globals->resolve_ressource_path(path); SGPath tpath = globals->resolve_resource_path(path);
if( tpath.isNull() || !tpath.exists() ) if( tpath.isNull() || !tpath.exists() )
{ {
SG_LOG(SG_GL, SG_ALERT, "canvas::Image: No such image: " << path); SG_LOG(SG_GL, SG_ALERT, "canvas::Image: No such image: " << path);

2
src/Canvas/elements/text.cxx
View file

@ -284,7 +284,7 @@ namespace canvas
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
Text::font_ptr Text::getFont(const std::string& name) Text::font_ptr Text::getFont(const std::string& name)
{ {
SGPath path = globals->resolve_ressource_path("Fonts/" + name); SGPath path = globals->resolve_resource_path("Fonts/" + name);
if( path.isNull() ) if( path.isNull() )
{ {
SG_LOG SG_LOG

2
src/Main/globals.cxx
View file

@ -327,7 +327,7 @@ SGPath FGGlobals::resolve_maybe_aircraft_path(const std::string& branch) const
return simgear::ResourceManager::instance()->findPath(branch); return simgear::ResourceManager::instance()->findPath(branch);
} }
SGPath FGGlobals::resolve_ressource_path(const std::string& branch) const SGPath FGGlobals::resolve_resource_path(const std::string& branch) const
{ {
return simgear::ResourceManager::instance() return simgear::ResourceManager::instance()
->findPath(branch, SGPath(fgGetString("/sim/aircraft-dir"))); ->findPath(branch, SGPath(fgGetString("/sim/aircraft-dir")));

2
src/Main/globals.hxx
View file

@ -211,7 +211,7 @@ public:
* 2. All aircraft directories if branch starts with Aircraft/ * 2. All aircraft directories if branch starts with Aircraft/
* 3. fg_data directory * 3. fg_data directory
*/ */
SGPath resolve_ressource_path(const std::string& branch) const; SGPath resolve_resource_path(const std::string& branch) const;
inline const std::string &get_browser () const { return browser; } inline const std::string &get_browser () const { return browser; }
void set_browser (const std::string &b) { browser = b; } void set_browser (const std::string &b) { browser = b; }