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

Merge remote-tracking branch 'upstream/miami' into miami

Browse Source
This commit is contained in:
Nikolay Korolev
2020-05-23 20:07:30 +03:00
parent 607175f02a 5276abb0fb
commit 2966be41ba
29 changed files with 489 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicles/Vehicle.cpp
View File

@ -624,8 +624,10 @@ CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage
case WEAPONTYPE_SILENCED_INGRAM:
case WEAPONTYPE_MP5:
case WEAPONTYPE_SHOTGUN:
case WEAPONTYPE_AK47:
case WEAPONTYPE_M16:
case WEAPONTYPE_SPAS12_SHOTGUN:
case WEAPONTYPE_STUBBY_SHOTGUN:
case WEAPONTYPE_RUGER:
case WEAPONTYPE_M4:
case WEAPONTYPE_SNIPERRIFLE:
case WEAPONTYPE_HELICANNON:
case WEAPONTYPE_UZI_DRIVEBY:

4
src/vehicles/Vehicle.h
View File

@ -120,13 +120,9 @@ enum eVehicleAppearance
VEHICLE_APPEARANCE_PLANE,
};
// Or Weapon.h?
void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage);
class CVehicle : public CPhysical
{
public:
// 0x128
tHandlingData *pHandling;
CAutoPilot AutoPilot;
uint8 m_currentColour1;