fly/flightgear
1
0
Fork 0
Code Activity

Simplify ssg branch deletion code. Saying we were doing it the

Browse source 
round-a-bout hard way would be an understatement.
This commit is contained in:
curt 1999-10-06 20:59:52 +00:00
parent f8df262633
commit da3271e103
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Scenery/tileentry.cxx
View file

@ -99,11 +99,19 @@ FGTileEntry::free_tile()
// delete the ssg branch // delete the ssg branch
// make sure we have a sane number of parents
int pcount = select_ptr->getNumParents(); int pcount = select_ptr->getNumParents();
if ( pcount > 0 ) { if ( pcount > 0 ) {
// find the first parent (should only be one) // find the first parent (should only be one)
ssgBranch *parent = select_ptr->getParent( 0 ) ; ssgBranch *parent = select_ptr->getParent( 0 ) ;
if( parent ) {
parent->removeKid(select_ptr);
} else {
FG_LOG( FG_TERRAIN, FG_ALERT,
"parent pointer is NULL! Dying" );
exit(-1);
}
#if 0
// find the number of kids this parent has // find the number of kids this parent has
int kcount = parent->getNumKids(); int kcount = parent->getNumKids();
// find the kid that matches our original select_ptr // find the kid that matches our original select_ptr
@ -122,6 +130,8 @@ FGTileEntry::free_tile()
"Couldn't find the kid to delete! Dying" ); "Couldn't find the kid to delete! Dying" );
exit(-1); exit(-1);
} }
#endif
} else { } else {
FG_LOG( FG_TERRAIN, FG_ALERT, FG_LOG( FG_TERRAIN, FG_ALERT,
"Parent count is zero for an ssg tile! Dying" ); "Parent count is zero for an ssg tile! Dying" );