mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-23 08:11:49 +01:00
Merge pull request #887 from waliedyassen/master-automobile-fixes
Few bug fixes in CAutomobile for re3
This commit is contained in:
commit
703750a1ff
@ -768,7 +768,7 @@ CAutomobile::ProcessControl(void)
|
|||||||
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceB);
|
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceB);
|
||||||
WheelState[CARWHEEL_FRONT_LEFT] = m_aWheelState[CARWHEEL_FRONT_LEFT];
|
WheelState[CARWHEEL_FRONT_LEFT] = m_aWheelState[CARWHEEL_FRONT_LEFT];
|
||||||
|
|
||||||
if(Damage.GetWheelStatus(VEHWHEEL_FRONT_LEFT) == WHEEL_STATUS_BURST)
|
if(Damage.GetWheelStatus(CARWHEEL_FRONT_LEFT) == WHEEL_STATUS_BURST)
|
||||||
ProcessWheel(wheelFwd, wheelRight,
|
ProcessWheel(wheelFwd, wheelRight,
|
||||||
contactSpeeds[CARWHEEL_FRONT_LEFT], contactPoints[CARWHEEL_FRONT_LEFT],
|
contactSpeeds[CARWHEEL_FRONT_LEFT], contactPoints[CARWHEEL_FRONT_LEFT],
|
||||||
m_nWheelsOnGround, fThrust,
|
m_nWheelsOnGround, fThrust,
|
||||||
@ -802,7 +802,7 @@ CAutomobile::ProcessControl(void)
|
|||||||
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceB);
|
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceB);
|
||||||
WheelState[CARWHEEL_FRONT_RIGHT] = m_aWheelState[CARWHEEL_FRONT_RIGHT];
|
WheelState[CARWHEEL_FRONT_RIGHT] = m_aWheelState[CARWHEEL_FRONT_RIGHT];
|
||||||
|
|
||||||
if(Damage.GetWheelStatus(VEHWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
|
if(Damage.GetWheelStatus(CARWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
|
||||||
ProcessWheel(wheelFwd, wheelRight,
|
ProcessWheel(wheelFwd, wheelRight,
|
||||||
contactSpeeds[CARWHEEL_FRONT_RIGHT], contactPoints[CARWHEEL_FRONT_RIGHT],
|
contactSpeeds[CARWHEEL_FRONT_RIGHT], contactPoints[CARWHEEL_FRONT_RIGHT],
|
||||||
m_nWheelsOnGround, fThrust,
|
m_nWheelsOnGround, fThrust,
|
||||||
@ -883,7 +883,7 @@ CAutomobile::ProcessControl(void)
|
|||||||
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB);
|
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB);
|
||||||
WheelState[CARWHEEL_REAR_LEFT] = m_aWheelState[CARWHEEL_REAR_LEFT];
|
WheelState[CARWHEEL_REAR_LEFT] = m_aWheelState[CARWHEEL_REAR_LEFT];
|
||||||
|
|
||||||
if(Damage.GetWheelStatus(VEHWHEEL_REAR_LEFT) == WHEEL_STATUS_BURST)
|
if(Damage.GetWheelStatus(CARWHEEL_REAR_LEFT) == WHEEL_STATUS_BURST)
|
||||||
ProcessWheel(wheelFwd, wheelRight,
|
ProcessWheel(wheelFwd, wheelRight,
|
||||||
contactSpeeds[CARWHEEL_REAR_LEFT], contactPoints[CARWHEEL_REAR_LEFT],
|
contactSpeeds[CARWHEEL_REAR_LEFT], contactPoints[CARWHEEL_REAR_LEFT],
|
||||||
m_nWheelsOnGround, fThrust,
|
m_nWheelsOnGround, fThrust,
|
||||||
@ -917,7 +917,7 @@ CAutomobile::ProcessControl(void)
|
|||||||
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB);
|
adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB);
|
||||||
WheelState[CARWHEEL_REAR_RIGHT] = m_aWheelState[CARWHEEL_REAR_RIGHT];
|
WheelState[CARWHEEL_REAR_RIGHT] = m_aWheelState[CARWHEEL_REAR_RIGHT];
|
||||||
|
|
||||||
if(Damage.GetWheelStatus(VEHWHEEL_REAR_RIGHT) == WHEEL_STATUS_BURST)
|
if(Damage.GetWheelStatus(CARWHEEL_REAR_RIGHT) == WHEEL_STATUS_BURST)
|
||||||
ProcessWheel(wheelFwd, wheelRight,
|
ProcessWheel(wheelFwd, wheelRight,
|
||||||
contactSpeeds[CARWHEEL_REAR_RIGHT], contactPoints[CARWHEEL_REAR_RIGHT],
|
contactSpeeds[CARWHEEL_REAR_RIGHT], contactPoints[CARWHEEL_REAR_RIGHT],
|
||||||
m_nWheelsOnGround, fThrust,
|
m_nWheelsOnGround, fThrust,
|
||||||
@ -3946,10 +3946,10 @@ void
|
|||||||
CAutomobile::BurstTyre(uint8 wheel)
|
CAutomobile::BurstTyre(uint8 wheel)
|
||||||
{
|
{
|
||||||
switch(wheel){
|
switch(wheel){
|
||||||
case CAR_PIECE_WHEEL_LF: wheel = VEHWHEEL_FRONT_LEFT; break;
|
case CAR_PIECE_WHEEL_LF: wheel = CARWHEEL_FRONT_LEFT; break;
|
||||||
case CAR_PIECE_WHEEL_LR: wheel = VEHWHEEL_REAR_LEFT; break;
|
case CAR_PIECE_WHEEL_RF: wheel = CARWHEEL_FRONT_RIGHT; break;
|
||||||
case CAR_PIECE_WHEEL_RF: wheel = VEHWHEEL_FRONT_RIGHT; break;
|
case CAR_PIECE_WHEEL_LR: wheel = CARWHEEL_REAR_LEFT; break;
|
||||||
case CAR_PIECE_WHEEL_RR: wheel = VEHWHEEL_REAR_RIGHT; break;
|
case CAR_PIECE_WHEEL_RR: wheel = CARWHEEL_REAR_RIGHT; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
int status = Damage.GetWheelStatus(wheel);
|
int status = Damage.GetWheelStatus(wheel);
|
||||||
|
@ -30,8 +30,6 @@ enum eCarNodes
|
|||||||
NUM_CAR_NODES,
|
NUM_CAR_NODES,
|
||||||
};
|
};
|
||||||
|
|
||||||
// These are used for all the wheel arrays
|
|
||||||
// DON'T confuse with VEHWHEEL, which are vehicle components
|
|
||||||
enum {
|
enum {
|
||||||
CARWHEEL_FRONT_LEFT,
|
CARWHEEL_FRONT_LEFT,
|
||||||
CARWHEEL_REAR_LEFT,
|
CARWHEEL_REAR_LEFT,
|
||||||
|
@ -57,14 +57,6 @@ enum eLights
|
|||||||
VEHLIGHT_REAR_RIGHT,
|
VEHLIGHT_REAR_RIGHT,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum eWheels
|
|
||||||
{
|
|
||||||
VEHWHEEL_FRONT_LEFT,
|
|
||||||
VEHWHEEL_FRONT_RIGHT,
|
|
||||||
VEHWHEEL_REAR_LEFT,
|
|
||||||
VEHWHEEL_REAR_RIGHT,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
CAR_PIECE_BONNET = 1,
|
CAR_PIECE_BONNET = 1,
|
||||||
|
Loading…
Reference in New Issue
Block a user