Make use of the ground material types

[flightgear.git] / src / Scenery / tileentry.cxx

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index 173b1d2b5c76a3c172c9b08adffda9b4a2600671..7845bd0325772897c3de8c9b744ce76399c373a7 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -653,7 +653,7 @@ typedef enum {
     OBJECT,
     OBJECT_SHARED,
     OBJECT_STATIC,
-    OBJECT_TAXI_SIGN,
+    OBJECT_SIGN,
     OBJECT_RUNWAY_SIGN
 } object_type;
 
@@ -766,8 +766,8 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
             } else if ( token == "OBJECT_SHARED" ) {
                 objects.push_back(new Object(OBJECT_SHARED, token, tile_path, in));
 
-            } else if ( token == "OBJECT_TAXI_SIGN" ) {
-                objects.push_back(new Object(OBJECT_TAXI_SIGN, token, tile_path, in));
+            } else if ( token == "OBJECT_SIGN" ) {
+                objects.push_back(new Object(OBJECT_SIGN, token, tile_path, in));
 
             } else if ( token == "OBJECT_RUNWAY_SIGN" ) {
                 objects.push_back(new Object(OBJECT_RUNWAY_SIGN, token, tile_path, in));
@@ -876,13 +876,14 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
                 = new FGDeferredModel( custom_path.str(),
                                        obj->path.str(),
                                        tile_bucket,
-                                       this, obj_trans );
+                                       this, obj_trans,
+                                       obj->type == OBJECT_SHARED );
             FGTileMgr::model_ready( dm );
 
 
-        } else if (obj->type == OBJECT_TAXI_SIGN || obj->type == OBJECT_RUNWAY_SIGN) {
+        } else if (obj->type == OBJECT_SIGN || obj->type == OBJECT_RUNWAY_SIGN) {
             ssgBranch *(*make_sign)(SGMaterialLib *, const string, const string);
-            make_sign = obj->type == OBJECT_TAXI_SIGN ? sgMakeTaxiSign : sgMakeRunwaySign;
+            make_sign = obj->type == OBJECT_SIGN ? sgMakeSign : sgMakeRunwaySign;
 
             // load the object itself
             SGPath custom_path = obj->path;