One more pass at a reorg.

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

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index d2248c931e43d1fb3931f7ab5a4c76c55b9c377a..fa860606ceea82c35cd9f5c0ba1fae81858d05ea 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -21,7 +21,7 @@
 // $Id$
 
 
-#include <Include/compiler.h>
+#include <simgear/compiler.h>
 
 #ifdef FG_MATH_EXCEPTION_CLASH
 #  include <math.h>
@@ -30,8 +30,8 @@
 #include STL_FUNCTIONAL
 #include STL_ALGORITHM
 
-#include <Debug/logstream.hxx>
-#include <Bucket/newbucket.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "tileentry.hxx"
 
@@ -98,12 +98,20 @@ void FGTileEntry::free_tile() {
            << " texture coordinate arrays" );
 
     for ( i = 0; i < (int)vec3_ptrs.size(); ++i ) {
+#ifdef MACOS
+       delete [] vec3_ptrs[i];
+#else
        delete vec3_ptrs[i];
+#endif
     }
     vec3_ptrs.clear();
 
     for ( i = 0; i < (int)vec2_ptrs.size(); ++i ) {
+#ifdef MACOS
+       delete [] vec2_ptrs[i];
+#else
        delete vec2_ptrs[i];
+#endif
     }
     vec2_ptrs.clear();
 
@@ -119,7 +127,7 @@ void FGTileEntry::free_tile() {
        // find the first parent (should only be one)
        ssgBranch *parent = select_ptr->getParent( 0 ) ;
        if( parent ) {
-           my_remove_branch( select_ptr );
+           // my_remove_branch( select_ptr );
            parent->removeKid( select_ptr );
        } else {
            FG_LOG( FG_TERRAIN, FG_ALERT,