Further restructuring of the scenery loading code.

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

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 8c0ebdb3cac1fa9ec87ecc221c6ea8645e6be3e0..d5d07a9b2135a88adc1bc25f12a3819623ac0bd5 100644 (file)
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -173,13 +173,17 @@ bool FGNewCache::make_space() {
            return false;
        }
     }
+
+    SG_LOG( SG_TERRAIN, SG_ALERT, "WHOOPS!!! Hit an unhandled condition in  "
+            "FGNewCache::make_space()." );
+    return false;
 }
 
 
 // Clear all completely loaded tiles (ignores partially loaded tiles)
 void FGNewCache::clear_cache() {
     // This is a hack that should really get cleaned up at some point
-    extern ssgBranch *terrain;
+    extern ssgBranch *terrain_branch;
 
     tile_map_iterator current = tile_cache.begin();
     tile_map_iterator end = tile_cache.end();
@@ -195,7 +199,7 @@ void FGNewCache::clear_cache() {
     }
 
     // and ... just in case we missed something ... 
-    terrain->removeAllKids();
+    terrain_branch->removeAllKids();
 }