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

Merge pull request #440 from Fire-Head/master

Browse Source 
CWeapon done, fixes
This commit is contained in:
Nikolay Korolev
2020-04-15 23:28:09 +03:00
committed by GitHub
parent a43ca86542 190bc696d8
commit 5cb7e2e42a
22 changed files with 2331 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/Physical.cpp
View File

@ -612,7 +612,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
if(model == MI_FIRE_HYDRANT && !Bobj->bHasBeenDamaged){
CParticleObject::AddObject(POBJECT_FIRE_HYDRANT, B->GetPosition() - CVector(0.0f, 0.0f, 0.5f), true);
Bobj->bHasBeenDamaged = true;
}else if(B->IsObject() && model != MI_EXPLODINGBARREL && model != MI_PETROLPUMP)
}else if(B->IsObject() && !IsExplosiveThingModel(model))
Bobj->bHasBeenDamaged = true;
}else{
if(IsGlass(B->GetModelIndex()))