mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-27 11:15:39 +00:00
Code Issues Projects Releases Wiki Activity

killing peds increase chaos level

Browse source
This commit is contained in:
eray orçunus 2020-06-20 22:44:31 +03:00
parent cc60ad1946
commit d6a853bd60
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/PlayerInfo.cpp
View file

@ -146,6 +146,8 @@ CPlayerInfo::Clear(void)
m_bDriveByAllowed = true; m_bDriveByAllowed = true;
m_nPreviousTimeRewardedForExplosion = 0; m_nPreviousTimeRewardedForExplosion = 0;
m_nExplosionsSinceLastReward = 0; m_nExplosionsSinceLastReward = 0;
m_nHavocLevel = 0;
m_fMediaAttention = 0;
m_nCurrentBustedAudio = 1; m_nCurrentBustedAudio = 1;
m_nBustedAudioStatus = BUSTEDAUDIO_NONE; m_nBustedAudioStatus = BUSTEDAUDIO_NONE;
} }

13
src/peds/Ped.cpp
View file

@ -4069,7 +4069,8 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
bool willLinger = false; bool willLinger = false;
int random; int random;
// TODO(Miami): PlayerInfo thingies here if (damagedBy == FindPlayerPed() && damagedBy != this && damage > 3.0f)
++CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel;
if (player == this) { if (player == this) {
if (!player->m_bCanBeDamaged) if (!player->m_bCanBeDamaged)
@ -4535,11 +4536,11 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
m_pMyVehicle->SetStatus(STATUS_ABANDONED); m_pMyVehicle->SetStatus(STATUS_ABANDONED);
} }
SetDie(dieAnim, dieDelta, dieSpeed); SetDie(dieAnim, dieDelta, dieSpeed);
/*
if (damagedBy == FindPlayerPed() && damagedBy != this) { if (damagedBy == FindPlayerPed() && damagedBy != this) {
// TODO(Miami): PlayerInfo stuff CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 10;
CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 5.f;
} }
*/
} }
} }
for (int i = 0; i < ARRAY_SIZE(pVehicle->pPassengers); i++) { for (int i = 0; i < ARRAY_SIZE(pVehicle->pPassengers); i++) {
@ -4575,9 +4576,9 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
SetDie(dieAnim, dieDelta, dieSpeed); SetDie(dieAnim, dieDelta, dieSpeed);
if (damagedBy == player || damagedBy && damagedBy == FindPlayerVehicle()) { if (damagedBy == player || damagedBy && damagedBy == FindPlayerVehicle()) {
// TODO(Miami): PlayerInfo stuff
CDarkel::RegisterKillByPlayer(this, method, headShot); CDarkel::RegisterKillByPlayer(this, method, headShot);
CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 10;
CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 5.f;
m_threatEntity = player; m_threatEntity = player;
} else { } else {
CDarkel::RegisterKillNotByPlayer(this, method); CDarkel::RegisterKillNotByPlayer(this, method);