Multiplayer client/server system -- MessageBuf class and test harness complete

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

diff --git a/src/Scenery/hitlist.cxx b/src/Scenery/hitlist.cxx
index 3736908d8e5563d82b1480ea6b7ef4b585a4d1a6..630e6685eb8a56f7fb4e4f63165e7c6e0f62eb7d 100644 (file)
--- a/src/Scenery/hitlist.cxx
+++ b/src/Scenery/hitlist.cxx
@@ -17,6 +17,7 @@
 
 #include <Main/globals.hxx>
 #include <Main/viewer.hxx>
+#include <Scenery/scenery.hxx>
 
 #include "hitlist.hxx"
 
@@ -347,7 +348,8 @@ void FGHitList::IntersectBranch( ssgBranch *branch, sgdMat4 m,
             kid != NULL;
             kid = branch->getNextKid() )
     {
-        if ( kid->getTraversalMask() & SSGTRAV_HOT )
+        if ( kid->getTraversalMask() & SSGTRAV_HOT
+             && !kid->getBSphere()->isEmpty() )
         {
             sgdVec3 center;
             sgdSetVec3( center,
@@ -509,7 +511,8 @@ bool fgCurrentElev( sgdVec3 abs_view_pos, sgdVec3 scenery_center,
     sgdCopyVec3(orig, view_pos );
     sgdCopyVec3(dir, abs_view_pos );
 
-    hit_list->Intersect( globals->get_terrain_branch(), orig, dir );
+    hit_list->Intersect( globals->get_scenery()->get_terrain_branch(),
+                         orig, dir );
 
     int this_hit=0;
     Point3D geoc;