fly/flightgear
1
0
Fork 0
Code Activity

rename OBJECT_TAXI_SIGN to OBJECT_SIGN. This isn't about taxi signs any

Browse source 
more, but all sorts of signs. Now is the best time to get rid of a
misleading name.
This commit is contained in:
mfranz 2006-04-14 14:50:11 +00:00
parent fe78690623
commit ec5ea9f344
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Scenery/tileentry.cxx
View file

@ -653,7 +653,7 @@ typedef enum {
OBJECT, OBJECT,
OBJECT_SHARED, OBJECT_SHARED,
OBJECT_STATIC, OBJECT_STATIC,
OBJECT_TAXI_SIGN, OBJECT_SIGN,
OBJECT_RUNWAY_SIGN OBJECT_RUNWAY_SIGN
} object_type; } object_type;
@ -766,8 +766,8 @@ FGTileEntry::load( const string_list &path_list, bool is_base )
} else if ( token == "OBJECT_SHARED" ) { } else if ( token == "OBJECT_SHARED" ) {
objects.push_back(new Object(OBJECT_SHARED, token, tile_path, in)); objects.push_back(new Object(OBJECT_SHARED, token, tile_path, in));
} else if ( token == "OBJECT_TAXI_SIGN" ) { } else if ( token == "OBJECT_SIGN" ) {
objects.push_back(new Object(OBJECT_TAXI_SIGN, token, tile_path, in)); objects.push_back(new Object(OBJECT_SIGN, token, tile_path, in));
} else if ( token == "OBJECT_RUNWAY_SIGN" ) { } else if ( token == "OBJECT_RUNWAY_SIGN" ) {
objects.push_back(new Object(OBJECT_RUNWAY_SIGN, token, tile_path, in)); 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 ); 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); 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 // load the object itself
SGPath custom_path = obj->path; SGPath custom_path = obj->path;