diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 09:36:58 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 09:36:58 +0300 |
| commit | 2c79080e1b16cb794b33e24508c11ab4fc259b48 (patch) | |
| tree | 9f602753c501bd1524179753beeb52771f43e924 /src/collision/Collision.cpp | |
| parent | e042ba6f24aa39bd4b29b7abd0c3899680f3d235 (diff) | |
| parent | 75f812cfcd08cddcd01cf58e9fa59d7844cb42c8 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/core/Radar.cpp
# src/core/Radar.h
Diffstat (limited to 'src/collision/Collision.cpp')
| -rw-r--r-- | src/collision/Collision.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/collision/Collision.cpp b/src/collision/Collision.cpp index bb2c2e71..946513d3 100644 --- a/src/collision/Collision.cpp +++ b/src/collision/Collision.cpp @@ -105,7 +105,7 @@ GetCollisionInSectorList(CPtrList &list) for(node = list.first; node; node = node->next){ e = (CEntity*)node->item; - level = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel()->level; + level = CModelInfo::GetColModel(e->GetModelIndex())->level; if(level != LEVEL_GENERIC) return (eLevelName)level; } |