archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-07 17:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	src/core/Radar.cpp
#	src/core/Radar.h
This commit is contained in:
Sergeanur
2021-08-11 09:36:58 +03:00
parent e042ba6f24 75f812cfcd
commit 2c79080e1b
15 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/collision/Collision.cpp
View File

@ -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;
}