mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 06:50:00 +00:00
commit
704a5c158f
|
@ -1450,6 +1450,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||||
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
||||||
{
|
{
|
||||||
slot = nCurrentPedSlot - i - 1;
|
slot = nCurrentPedSlot - i - 1;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (slot < 0)
|
||||||
|
slot += ARRAY_SIZE(nPedSlotSfx);
|
||||||
|
#endif
|
||||||
if ( nComment == nPedSlotSfx[slot] )
|
if ( nComment == nPedSlotSfx[slot] )
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -780,6 +780,10 @@ cSampleManager::IsPedCommentLoaded(uint32 nComment)
|
||||||
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
for ( int32 i = 0; i < _TODOCONST(3); i++ )
|
||||||
{
|
{
|
||||||
slot = nCurrentPedSlot - i - 1;
|
slot = nCurrentPedSlot - i - 1;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (slot < 0)
|
||||||
|
slot += ARRAY_SIZE(nPedSlotSfx);
|
||||||
|
#endif
|
||||||
if ( nComment == nPedSlotSfx[slot] )
|
if ( nComment == nPedSlotSfx[slot] )
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16166,7 +16166,11 @@ CPed::SeekCar(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dest.x == 0.0f && dest.y == 0.0f) {
|
if (dest.x == 0.0f && dest.y == 0.0f) {
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver || !vehToSeek->CanPedOpenLocks(this)) {
|
||||||
|
#else
|
||||||
if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver) {
|
if ((!IsPlayer() && CharCreatedBy != MISSION_CHAR) || vehToSeek->VehicleCreatedBy != MISSION_VEHICLE || vehToSeek->pDriver) {
|
||||||
|
#endif
|
||||||
RestorePreviousState();
|
RestorePreviousState();
|
||||||
if (IsPlayer()) {
|
if (IsPlayer()) {
|
||||||
ClearObjective();
|
ClearObjective();
|
||||||
|
|
|
@ -184,7 +184,11 @@ CBoat::ProcessControl(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
float collisionDamage = pHandling->fCollisionDamageMultiplier * m_fDamageImpulse;
|
float collisionDamage = pHandling->fCollisionDamageMultiplier * m_fDamageImpulse;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f && !bCollisionProof) {
|
||||||
|
#else
|
||||||
if(collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f){
|
if(collisionDamage > 25.0f && GetStatus() != STATUS_WRECKED && m_fHealth >= 150.0f){
|
||||||
|
#endif
|
||||||
float prevHealth = m_fHealth;
|
float prevHealth = m_fHealth;
|
||||||
if(this == FindPlayerVehicle()){
|
if(this == FindPlayerVehicle()){
|
||||||
if(bTakeLessDamage)
|
if(bTakeLessDamage)
|
||||||
|
|
Loading…
Reference in a new issue