Merge commit 'b846e33' into next

[simgear.git] / simgear / scene / tgdb / TileCache.cxx

diff --git a/simgear/scene/tgdb/TileCache.cxx b/simgear/scene/tgdb/TileCache.cxx
index 9004f706353982465db8178769792ea1b38cb34a..1d34fd8df06ff04ebfa457ff1a02b42dca2aff80 100644 (file)
--- a/simgear/scene/tgdb/TileCache.cxx
+++ b/simgear/scene/tgdb/TileCache.cxx
@@ -20,6 +20,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -27,13 +31,11 @@
 #include "TileEntry.hxx"
 #include "TileCache.hxx"
 
-SG_USING_NAMESPACE(std);
-
 using simgear::TileEntry;
 using simgear::TileCache;
 
 TileCache::TileCache( void ) :
-    max_cache_size(100)
+    max_cache_size(100), current_time(0.0)
 {
     tile_cache.clear();
 }
@@ -50,7 +52,6 @@ void TileCache::entry_free( long cache_index ) {
     TileEntry *tile = tile_cache[cache_index];
     tile->removeFromSceneGraph();
 
-    tile->free_tile();
     delete tile;
 
     tile_cache.erase( cache_index );
@@ -165,6 +166,7 @@ bool TileCache::insert_tile( TileEntry *e ) {
     // register tile in the cache
     long tile_index = e->get_tile_bucket().gen_index();
     tile_cache[tile_index] = e;
+    e->set_timestamp(current_time);
 
     return true;
 }