From: david <david>
Date: Sun, 22 Sep 2002 11:46:53 +0000 (+0000)
Subject: Added OBJECT_SHARED, which is identical to OBJECT_STATIC except that
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3a1a9335e6e70b7a41961995f2c936583faedf9;p=flightgear.git

Added OBJECT_SHARED, which is identical to OBJECT_STATIC except that
the object is loaded relative to $FG_ROOT rather than to the current
scenery directory.
---

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index a1ef521cd..becb3b11d 100644
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -1196,7 +1196,8 @@ FGTileEntry::load( const SGPath& base, bool is_base )
 		    delete rwy_lights;
 		}
 
-	    } else if ( token == "OBJECT_STATIC" ) {
+	    } else if ( token == "OBJECT_STATIC" ||
+                        token == "OBJECT_SHARED" ) {
 		// load object info
 		double lon, lat, elev, hdg;
 		in >> name >> lon >> lat >> elev >> hdg >> ::skipws;
@@ -1208,7 +1209,9 @@ FGTileEntry::load( const SGPath& base, bool is_base )
 
 		// object loading is deferred to main render thread,
 		// but lets figure out the paths right now.
-		SGPath custom_path = tile_path;
+		SGPath custom_path;
+                if ( token == "OBJECT_STATIC" )
+                    custom_path= tile_path;
 		custom_path.append( name );
 
 		sgCoord obj_pos;