From ec5ea9f3449f9298d43ec7610c80f3b0a77f9e00 Mon Sep 17 00:00:00 2001 From: mfranz Date: Fri, 14 Apr 2006 14:50:11 +0000 Subject: [PATCH] rename OBJECT_TAXI_SIGN to OBJECT_SIGN. This isn't about taxi signs any more, but all sorts of signs. Now is the best time to get rid of a misleading name. --- src/Scenery/tileentry.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx index b9487b0e0..7845bd032 100644 --- 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)); @@ -881,9 +881,9 @@ FGTileEntry::load( const string_list &path_list, bool is_base ) 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;