diff options
| author | Tartalo <none@none> | 2010-06-19 23:53:01 +0200 |
|---|---|---|
| committer | Tartalo <none@none> | 2010-06-19 23:53:01 +0200 |
| commit | f690bafd3ebbce9b9f817b4577f51a7314048191 (patch) | |
| tree | 438fec0ef3c960903207aed6bf450160ca4b12f2 /src | |
| parent | 2c407aca1fd7ae495d3c4c2995fe39bda0cef2b9 (diff) | |
| parent | cbf7d1594765d44f8998dad49db60d0479a30f04 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 79d0b57790a..1936ba6ebba 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -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; |