mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-14 11:54:44 +00:00
Code Issues 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
commit 5cb7e2e42a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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()))