mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-24 16:51:49 +01:00
Merge remote-tracking branch 'upstream/miami' into miami
This commit is contained in:
commit
a27fc8d9d9
@ -926,7 +926,7 @@ const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_
|
|||||||
{ "grenade", "grenade", MI_COP, awc(aThrowAnimations), aWeaponAnimDescs },
|
{ "grenade", "grenade", MI_COP, awc(aThrowAnimations), aWeaponAnimDescs },
|
||||||
{ "flame", "flame", MI_COP, awc(aFlamethrowerAnimations), aWeaponAnimDescs },
|
{ "flame", "flame", MI_COP, awc(aFlamethrowerAnimations), aWeaponAnimDescs },
|
||||||
{ "medic", "medic", MI_COP, awc(aMedicAnimations), aMedicAnimDescs },
|
{ "medic", "medic", MI_COP, awc(aMedicAnimations), aMedicAnimDescs },
|
||||||
{ "sunbathe", "sunbathe", MI_COP, awc(aSunbatheAnimations), aSunbatheAnimDescs },
|
{ "sunbathe", "sunbathe", MI_COP, 1, aSunbatheAnimations, aSunbatheAnimDescs }, // NB: not using awc here!
|
||||||
{ "playidles", "playidles", MI_COP, awc(aPlayerIdleAnimations), aPlayerIdleAnimDescs },
|
{ "playidles", "playidles", MI_COP, awc(aPlayerIdleAnimations), aPlayerIdleAnimDescs },
|
||||||
{ "riot", "riot", MI_COP, awc(aRiotAnimations), aRiotAnimDescs },
|
{ "riot", "riot", MI_COP, awc(aRiotAnimations), aRiotAnimDescs },
|
||||||
{ "strip", "strip", MI_COP, awc(aStripAnimations), aStripAnimDescs },
|
{ "strip", "strip", MI_COP, awc(aStripAnimations), aStripAnimDescs },
|
||||||
|
@ -865,8 +865,14 @@ CAutomobile::ProcessControl(void)
|
|||||||
CVector wheelFwd = GetForward();
|
CVector wheelFwd = GetForward();
|
||||||
CVector wheelRight = GetRight();
|
CVector wheelRight = GetRight();
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
// Not sure if this is needed, but brake usually has timestep as a factor
|
||||||
|
if(bIsHandbrakeOn)
|
||||||
|
brake = 20000.0f * CTimer::GetTimeStepFix();
|
||||||
|
#else
|
||||||
if(bIsHandbrakeOn)
|
if(bIsHandbrakeOn)
|
||||||
brake = 20000.0f;
|
brake = 20000.0f;
|
||||||
|
#endif
|
||||||
|
|
||||||
if(m_aWheelTimer[CARWHEEL_REAR_LEFT] > 0.0f){
|
if(m_aWheelTimer[CARWHEEL_REAR_LEFT] > 0.0f){
|
||||||
if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier))
|
if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier))
|
||||||
|
@ -494,6 +494,11 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
|
|||||||
if(contactSpeedRight != 0.0f){
|
if(contactSpeedRight != 0.0f){
|
||||||
// exert opposing force
|
// exert opposing force
|
||||||
right = -contactSpeedRight/wheelsOnGround;
|
right = -contactSpeedRight/wheelsOnGround;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
// contactSpeedRight is independent of framerate but right has timestep as a factor
|
||||||
|
// so we probably have to fix this
|
||||||
|
right *= CTimer::GetTimeStepFix();
|
||||||
|
#endif
|
||||||
|
|
||||||
if(wheelStatus == WHEEL_STATUS_BURST){
|
if(wheelStatus == WHEEL_STATUS_BURST){
|
||||||
float fwdspeed = Min(contactSpeedFwd, 0.3f);
|
float fwdspeed = Min(contactSpeedFwd, 0.3f);
|
||||||
@ -514,6 +519,11 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
|
|||||||
}
|
}
|
||||||
}else if(contactSpeedFwd != 0.0f){
|
}else if(contactSpeedFwd != 0.0f){
|
||||||
fwd = -contactSpeedFwd/wheelsOnGround;
|
fwd = -contactSpeedFwd/wheelsOnGround;
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
// contactSpeedFwd is independent of framerate but fwd has timestep as a factor
|
||||||
|
// so we probably have to fix this
|
||||||
|
fwd *= CTimer::GetTimeStepFix();
|
||||||
|
#endif
|
||||||
|
|
||||||
if(!bBraking){
|
if(!bBraking){
|
||||||
if(m_fGasPedal < 0.01f){
|
if(m_fGasPedal < 0.01f){
|
||||||
|
Loading…
Reference in New Issue
Block a user