From: Mathias Froehlich <Mathias.Froehlich@web.de>
Date: Tue, 6 Mar 2012 20:14:24 +0000 (+0100)
Subject: scenery: Remove unused argument from runway signs.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fbb7c844097f2256c807a51b53fc390eb32ac40d;p=simgear.git

scenery: Remove unused argument from runway signs.
---

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 92a6dab4..166da43d 100644
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -362,9 +362,9 @@ TileEntry::loadTileByFileName(const string& fileName,
 
             osg::Node *custom_obj = 0;
             if (obj->type == OBJECT_SIGN)
-                custom_obj = SGMakeSign(opt->getMaterialLib(), custom_path.str(), obj->name);
+                custom_obj = SGMakeSign(opt->getMaterialLib(), obj->name);
             else
-                custom_obj = SGMakeRunwaySign(opt->getMaterialLib(), custom_path.str(), obj->name);
+                custom_obj = SGMakeRunwaySign(opt->getMaterialLib(), obj->name);
 
             // wire the pieces together
             if ( custom_obj != NULL ) {
diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx
index 80328d23..a1a42ce0 100644
--- a/simgear/scene/tgdb/apt_signs.cxx
+++ b/simgear/scene/tgdb/apt_signs.cxx
@@ -90,7 +90,7 @@ struct pair {
 // see $FG_ROOT/Docs/README.scenery
 //
 osg::Node*
-SGMakeSign(SGMaterialLib *matlib, const string& path, const string& content)
+SGMakeSign(SGMaterialLib *matlib, const string& content)
 {
     double sign_height = 1.0;  // meter
     bool lighted = true;
@@ -370,7 +370,7 @@ SGMakeSign(SGMaterialLib *matlib, const string& path, const string& content)
 }
 
 osg::Node*
-SGMakeRunwaySign(SGMaterialLib *matlib, const string& path, const string& name)
+SGMakeRunwaySign(SGMaterialLib *matlib, const string& name)
 {
     // for demo purposes we assume each element (letter) is 1x1 meter.
     // Sign is placed 0.25 meters above the ground
diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx
index 8e3718a4..c908be9e 100644
--- a/simgear/scene/tgdb/apt_signs.hxx
+++ b/simgear/scene/tgdb/apt_signs.hxx
@@ -42,13 +42,11 @@ using std::string;
 
 
 // Generate a generic sign
-osg::Node* SGMakeSign( SGMaterialLib *matlib,
-                       const string& path, const string& content );
+osg::Node* SGMakeSign( SGMaterialLib *matlib, const string& content );
 
 
 // Generate a runway sign
-osg::Node* SGMakeRunwaySign( SGMaterialLib *matlib,
-                             const string& path, const string& name );
+osg::Node* SGMakeRunwaySign( SGMaterialLib *matlib, const string& name );
 
 
 #endif // _SG_APT_SIGNS_HXX