From 9426928cdfce291546e074c5b3ac32164a615d1f Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 25 Sep 2012 10:07:11 +0100 Subject: [PATCH] Fix a typo. --- src/Canvas/elements/CanvasImage.cxx | 2 +- src/Canvas/elements/text.cxx | 2 +- src/Main/globals.cxx | 2 +- src/Main/globals.hxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Canvas/elements/CanvasImage.cxx b/src/Canvas/elements/CanvasImage.cxx index 8eb1e3e0c..a11db16a3 100644 --- a/src/Canvas/elements/CanvasImage.cxx +++ b/src/Canvas/elements/CanvasImage.cxx @@ -291,7 +291,7 @@ namespace canvas } else { - SGPath tpath = globals->resolve_ressource_path(path); + SGPath tpath = globals->resolve_resource_path(path); if( tpath.isNull() || !tpath.exists() ) { SG_LOG(SG_GL, SG_ALERT, "canvas::Image: No such image: " << path); diff --git a/src/Canvas/elements/text.cxx b/src/Canvas/elements/text.cxx index a7f44c4f1..35b6473d1 100644 --- a/src/Canvas/elements/text.cxx +++ b/src/Canvas/elements/text.cxx @@ -284,7 +284,7 @@ namespace canvas //---------------------------------------------------------------------------- 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() ) { SG_LOG diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx index 1d3e14264..683339dcf 100644 --- a/src/Main/globals.cxx +++ b/src/Main/globals.cxx @@ -327,7 +327,7 @@ SGPath FGGlobals::resolve_maybe_aircraft_path(const std::string& branch) const 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() ->findPath(branch, SGPath(fgGetString("/sim/aircraft-dir"))); diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx index 5fd300ced..97f07307a 100644 --- a/src/Main/globals.hxx +++ b/src/Main/globals.hxx @@ -211,7 +211,7 @@ public: * 2. All aircraft directories if branch starts with Aircraft/ * 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; } void set_browser (const std::string &b) { browser = b; }