mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-12 21:04:08 +00:00
Cleanup
This commit is contained in:
Filip Gawin
parent
af5bd951ae
commit
458fc63f01
41 changed files with 1487 additions and 8021 deletions
|
|
@ -7,13 +7,9 @@
|
|||
#include "ModelIndices.h"
|
||||
#include "VisibilityPlugins.h"
|
||||
#include "DMAudio.h"
|
||||
<<<<<<< HEAD
|
||||
#include "Clock.h"
|
||||
#include "TimeCycle.h"
|
||||
#include "ZoneCull.h"
|
||||
=======
|
||||
#include "Timecycle.h"
|
||||
>>>>>>> More audio ped
|
||||
#include "ZoneCull.h"
|
||||
#include "Camera.h"
|
||||
#include "Darkel.h"
|
||||
#include "Rubbish.h"
|
||||
|
|
@ -132,7 +128,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
|
|||
m_fGasPedal = 0.0f;
|
||||
m_fBrakePedal = 0.0f;
|
||||
m_pSetOnFireEntity = nil;
|
||||
field_594 = 0;
|
||||
m_fGasPedalAudio = 0;
|
||||
bNotDamagedUpsideDown = false;
|
||||
bMoreResistantToDamage = false;
|
||||
m_fVelocityChangeForAudio = 0.0f;
|
||||
|
|
@ -695,7 +691,7 @@ CAutomobile::ProcessControl(void)
|
|||
if(m_aSuspensionSpringRatio[i] < 1.0f)
|
||||
m_aWheelTimer[i] = 4.0f;
|
||||
else
|
||||
m_aWheelTimer[i] = Max(m_aWheelTimer[i]-CTimer::GetTimeStep(), 0.0f);
|
||||
m_aWheelTimer[i] = max(m_aWheelTimer[i]-CTimer::GetTimeStep(), 0.0f);
|
||||
|
||||
if(m_aWheelTimer[i] > 0.0f){
|
||||
m_nWheelsOnGround++;
|
||||
|
|
@ -1013,7 +1009,7 @@ CAutomobile::ProcessControl(void)
|
|||
|
||||
if(m_status != STATUS_PLAYER && m_status != STATUS_PLAYER_REMOTE && m_status != STATUS_PHYSICS){
|
||||
if(GetModelIndex() == MI_MIAMI_RCRAIDER || GetModelIndex() == MI_MIAMI_SPARROW)
|
||||
m_aWheelSpeed[0] = Max(m_aWheelSpeed[0]-0.0005f, 0.0f);
|
||||
m_aWheelSpeed[0] = max(m_aWheelSpeed[0]-0.0005f, 0.0f);
|
||||
}else if((GetModelIndex() == MI_DODO || CVehicle::bAllDodosCheat) &&
|
||||
m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){
|
||||
FlyingControl(FLIGHT_MODEL_DODO);
|
||||
|
|
@ -1021,7 +1017,7 @@ CAutomobile::ProcessControl(void)
|
|||
FlyingControl(FLIGHT_MODEL_HELI);
|
||||
}else if(GetModelIndex() == MI_MIAMI_RCRAIDER || GetModelIndex() == MI_MIAMI_SPARROW || bAllCarCheat){
|
||||
if(CPad::GetPad(0)->GetCircleJustDown())
|
||||
m_aWheelSpeed[0] = Max(m_aWheelSpeed[0]-0.03f, 0.0f);
|
||||
m_aWheelSpeed[0] = max(m_aWheelSpeed[0]-0.03f, 0.0f);
|
||||
if(m_aWheelSpeed[0] < 0.22f)
|
||||
m_aWheelSpeed[0] += 0.0001f;
|
||||
if(m_aWheelSpeed[0] > 0.15f)
|
||||
|
|
@ -1133,10 +1129,10 @@ CAutomobile::ProcessControl(void)
|
|||
if(speed > sq(0.1f)){
|
||||
speed = Sqrt(speed);
|
||||
if(suspShake > 0.0f){
|
||||
uint8 freq = Min(200.0f*suspShake*speed*2000.0f/m_fMass + 100.0f, 250.0f);
|
||||
uint8 freq = min(200.0f*suspShake*speed*2000.0f/m_fMass + 100.0f, 250.0f);
|
||||
CPad::GetPad(0)->StartShake(20000.0f*CTimer::GetTimeStep()/freq, freq);
|
||||
}else{
|
||||
uint8 freq = Min(200.0f*surfShake*speed*2000.0f/m_fMass + 40.0f, 145.0f);
|
||||
uint8 freq = min(200.0f*surfShake*speed*2000.0f/m_fMass + 40.0f, 145.0f);
|
||||
CPad::GetPad(0)->StartShake(5000.0f*CTimer::GetTimeStep()/freq, freq);
|
||||
}
|
||||
}
|
||||
|
|
@ -2590,7 +2586,7 @@ CAutomobile::HydraulicControl(void)
|
|||
float minz = pos.z + extendedLowerLimit - wheelRadius;
|
||||
if(minz < specialColModel->boundingBox.min.z)
|
||||
specialColModel->boundingBox.min.z = minz;
|
||||
float radius = Max(specialColModel->boundingBox.min.Magnitude(), specialColModel->boundingBox.max.Magnitude());
|
||||
float radius = max(specialColModel->boundingBox.min.Magnitude(), specialColModel->boundingBox.max.Magnitude());
|
||||
if(specialColModel->boundingSphere.radius < radius)
|
||||
specialColModel->boundingSphere.radius = radius;
|
||||
|
||||
|
|
@ -2689,10 +2685,10 @@ CAutomobile::HydraulicControl(void)
|
|||
float front = -rear;
|
||||
float right = CPad::GetPad(0)->GetCarGunLeftRight()/128.0f;
|
||||
float left = -right;
|
||||
suspChange[CARWHEEL_FRONT_LEFT] = Max(front+left, 0.0f);
|
||||
suspChange[CARWHEEL_REAR_LEFT] = Max(rear+left, 0.0f);
|
||||
suspChange[CARWHEEL_FRONT_RIGHT] = Max(front+right, 0.0f);
|
||||
suspChange[CARWHEEL_REAR_RIGHT] = Max(rear+right, 0.0f);
|
||||
suspChange[CARWHEEL_FRONT_LEFT] = max(front+left, 0.0f);
|
||||
suspChange[CARWHEEL_REAR_LEFT] = max(rear+left, 0.0f);
|
||||
suspChange[CARWHEEL_FRONT_RIGHT] = max(front+right, 0.0f);
|
||||
suspChange[CARWHEEL_REAR_RIGHT] = max(rear+right, 0.0f);
|
||||
|
||||
if(m_hydraulicState < 100){
|
||||
// Lowered, move wheels up
|
||||
|
|
@ -2808,7 +2804,7 @@ CAutomobile::ProcessBuoyancy(void)
|
|||
ApplyTurnForce(impulse, point);
|
||||
|
||||
CVector initialSpeed = m_vecMoveSpeed;
|
||||
float timeStep = Max(CTimer::GetTimeStep(), 0.01f);
|
||||
float timeStep = max(CTimer::GetTimeStep(), 0.01f);
|
||||
float impulseRatio = impulse.z / (GRAVITY * m_fMass * timeStep);
|
||||
float waterResistance = Pow(1.0f - 0.05f*impulseRatio, CTimer::GetTimeStep());
|
||||
m_vecMoveSpeed *= waterResistance;
|
||||
|
|
@ -2901,7 +2897,7 @@ CAutomobile::ProcessBuoyancy(void)
|
|||
float fSpeed = vSpeed.MagnitudeSqr();
|
||||
if(fSpeed > sq(0.05f)){
|
||||
fSpeed = Sqrt(fSpeed);
|
||||
float size = Min((fSpeed < 0.15f ? 0.25f : 0.75f)*fSpeed, 0.6f);
|
||||
float size = min((fSpeed < 0.15f ? 0.25f : 0.75f)*fSpeed, 0.6f);
|
||||
CVector right = 0.2f*fSpeed*GetRight() + 0.2f*vSpeed;
|
||||
|
||||
CParticle::AddParticle(PARTICLE_PED_SPLASH,
|
||||
|
|
@ -2983,11 +2979,11 @@ CAutomobile::DoDriveByShootings(void)
|
|||
|
||||
// TODO: what is this?
|
||||
if(!lookingLeft && m_weaponDoorTimerLeft > 0.0f){
|
||||
m_weaponDoorTimerLeft = Max(m_weaponDoorTimerLeft - CTimer::GetTimeStep()*0.1f, 0.0f);
|
||||
m_weaponDoorTimerLeft = max(m_weaponDoorTimerLeft - CTimer::GetTimeStep()*0.1f, 0.0f);
|
||||
ProcessOpenDoor(CAR_DOOR_LF, NUM_ANIMS, m_weaponDoorTimerLeft);
|
||||
}
|
||||
if(!lookingRight && m_weaponDoorTimerRight > 0.0f){
|
||||
m_weaponDoorTimerRight = Max(m_weaponDoorTimerRight - CTimer::GetTimeStep()*0.1f, 0.0f);
|
||||
m_weaponDoorTimerRight = max(m_weaponDoorTimerRight - CTimer::GetTimeStep()*0.1f, 0.0f);
|
||||
ProcessOpenDoor(CAR_DOOR_RF, NUM_ANIMS, m_weaponDoorTimerRight);
|
||||
}
|
||||
}
|
||||
|
|
@ -3135,7 +3131,7 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
|
|||
FindPlayerPed()->SetWantedLevelNoDrop(1);
|
||||
|
||||
if(m_status == STATUS_PLAYER && impulse > 50.0f){
|
||||
uint8 freq = Min(0.4f*impulse*2000.0f/m_fMass + 100.0f, 250.0f);
|
||||
uint8 freq = min(0.4f*impulse*2000.0f/m_fMass + 100.0f, 250.0f);
|
||||
CPad::GetPad(0)->StartShake(40000/freq, freq);
|
||||
}
|
||||
|
||||
|
|
@ -3288,7 +3284,7 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
|
|||
|
||||
if(m_pDamageEntity && m_pDamageEntity == FindPlayerVehicle() && impulse > 10.0f){
|
||||
int money = (doubleMoney ? 2 : 1) * impulse*pHandling->nMonetaryValue/1000000.0f;
|
||||
money = Min(money, 40);
|
||||
money = min(money, 40);
|
||||
if(money > 2){
|
||||
sprintf(gString, "$%d", money);
|
||||
CWorld::Players[CWorld::PlayerInFocus].m_nMoney += money;
|
||||
|
|
@ -3991,7 +3987,7 @@ CAutomobile::SetupSuspensionLines(void)
|
|||
// adjust col model to include suspension lines
|
||||
if(colModel->boundingBox.min.z > colModel->lines[0].p1.z)
|
||||
colModel->boundingBox.min.z = colModel->lines[0].p1.z;
|
||||
float radius = Max(colModel->boundingBox.min.Magnitude(), colModel->boundingBox.max.Magnitude());
|
||||
float radius = max(colModel->boundingBox.min.Magnitude(), colModel->boundingBox.max.Magnitude());
|
||||
if(colModel->boundingSphere.radius < radius)
|
||||
colModel->boundingSphere.radius = radius;
|
||||
|
||||
|
|
@ -4483,16 +4479,8 @@ CAutomobile::SetAllTaxiLights(bool set)
|
|||
class CAutomobile_ : public CAutomobile
|
||||
{
|
||||
public:
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
void ctor(int32 id, uint8 CreatedBy) { ::new (this) CAutomobile(id, CreatedBy); }
|
||||
void dtor() { CAutomobile::~CAutomobile(); }
|
||||
=======
|
||||
void dtor() { this->~CAutomobile(); }
|
||||
>>>>>>> More audio ped
|
||||
=======
|
||||
void dtor() { CAutomobile::~CAutomobile(); }
|
||||
>>>>>>> fix
|
||||
void SetModelIndex_(uint32 id) { CAutomobile::SetModelIndex(id); }
|
||||
void ProcessControl_(void) { CAutomobile::ProcessControl(); }
|
||||
void Teleport_(CVector v) { CAutomobile::Teleport(v); }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue