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

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	premake5.lua
This commit is contained in:
Sergeanur
2021-07-03 16:39:22 +03:00
parent dd790b00e5 3ed4cdf109
commit 5d5e0f62e8
18 changed files with 152 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/collision/ColStore.cpp
View File

@ -292,7 +292,7 @@ CColStore::LoadCollision(const CVector &pos, eLevelName level)
}else{
for (int j = 0; j < MAX_CLEANUP; j++) {
CPhysical* pEntity = nil;
cleanup_entity_struct* pCleanup = &CTheScripts::MissionCleanUp.m_sEntities[i];
cleanup_entity_struct* pCleanup = &CTheScripts::MissionCleanUp.m_sEntities[j];
if (pCleanup->type == CLEANUP_CAR) {
pEntity = CPools::GetVehiclePool()->GetAt(pCleanup->id);
if (!pEntity || pEntity->GetStatus() == STATUS_WRECKED)