Merge

--HG-- branch : trunk
2010-06-19 23:53:01 +02:00
parent 2c407aca1f cbf7d15947
commit f690bafd3e
1 changed files with 1 additions and 0 deletions
@@ -280,6 +280,7 @@ namespace VMAP
            if (instanceTree->second->GetLocationInfo(pos, info))
            {
                floor = info.ground_Z;
                ASSERT(floor < std::numeric_limits<float>::max());
                type = info.hitModel->GetLiquidType();
                if (ReqLiquidType && !(type & ReqLiquidType))
                    return false;