mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 04:50:00 +00:00
fixed darkel/replay
This commit is contained in:
parent
39678ba5ca
commit
2bfb54b192
|
@ -13,6 +13,9 @@
|
||||||
#include "Font.h"
|
#include "Font.h"
|
||||||
#include "Text.h"
|
#include "Text.h"
|
||||||
#include "Vehicle.h"
|
#include "Vehicle.h"
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
#include "Replay.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define FRENZY_ANY_PED -1
|
#define FRENZY_ANY_PED -1
|
||||||
#define FRENZY_ANY_CAR -2
|
#define FRENZY_ANY_CAR -2
|
||||||
|
@ -60,6 +63,10 @@ CDarkel::CalcFade(uint32 time, uint32 start, uint32 end)
|
||||||
void
|
void
|
||||||
CDarkel::DrawMessages()
|
CDarkel::DrawMessages()
|
||||||
{
|
{
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (CReplay::IsPlayingBack())
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
switch (Status) {
|
switch (Status) {
|
||||||
case KILLFRENZY_ONGOING:
|
case KILLFRENZY_ONGOING:
|
||||||
{
|
{
|
||||||
|
@ -171,6 +178,10 @@ CDarkel::ReadStatus()
|
||||||
void
|
void
|
||||||
CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
|
CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
|
||||||
{
|
{
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (CReplay::IsPlayingBack())
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
if (FrenzyOnGoing()) {
|
if (FrenzyOnGoing()) {
|
||||||
int32 model = vehicle->GetModelIndex();
|
int32 model = vehicle->GetModelIndex();
|
||||||
if (ModelToKill == FRENZY_ANY_CAR || ModelToKill == model || ModelToKill2 == model || ModelToKill3 == model || ModelToKill4 == model) {
|
if (ModelToKill == FRENZY_ANY_CAR || ModelToKill == model || ModelToKill2 == model || ModelToKill3 == model || ModelToKill4 == model) {
|
||||||
|
@ -185,6 +196,10 @@ CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
|
||||||
void
|
void
|
||||||
CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
|
CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
|
||||||
{
|
{
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (CReplay::IsPlayingBack())
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
if (FrenzyOnGoing() && (weapon == WeaponType
|
if (FrenzyOnGoing() && (weapon == WeaponType
|
||||||
|| weapon == WEAPONTYPE_EXPLOSION
|
|| weapon == WEAPONTYPE_EXPLOSION
|
||||||
|| weapon == WEAPONTYPE_UZI_DRIVEBY && WeaponType == WEAPONTYPE_UZI
|
|| weapon == WEAPONTYPE_UZI_DRIVEBY && WeaponType == WEAPONTYPE_UZI
|
||||||
|
@ -210,6 +225,10 @@ CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
|
||||||
void
|
void
|
||||||
CDarkel::RegisterKillNotByPlayer(CPed* victim, eWeaponType weapontype)
|
CDarkel::RegisterKillNotByPlayer(CPed* victim, eWeaponType weapontype)
|
||||||
{
|
{
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (CReplay::IsPlayingBack())
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
CStats::PeopleKilledByOthers++;
|
CStats::PeopleKilledByOthers++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -301,6 +320,11 @@ CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 mode
|
||||||
void
|
void
|
||||||
CDarkel::Update()
|
CDarkel::Update()
|
||||||
{
|
{
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (CReplay::IsPlayingBack())
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (Status != KILLFRENZY_ONGOING)
|
if (Status != KILLFRENZY_ONGOING)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -706,7 +706,7 @@ CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef FIX_BUGS // removing dumb case when shooting police car in player's own garage gives wanted level
|
#ifdef FIX_BUGS // removing dumb case when shooting police car in player's own garage gives wanted level
|
||||||
if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed() && !bHasBeenOwnedByPlayer)
|
if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed() && damagedBy != nil && !bHasBeenOwnedByPlayer)
|
||||||
#else
|
#else
|
||||||
if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed())
|
if (GetModelIndex() == MI_POLICE && damagedBy == FindPlayerPed())
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue