Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-08 11:38:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed leaning values in mohaas/mohaab

Browse source
This commit is contained in:
smallmodel 2023-08-20 13:54:25 +02:00
parent 31d19cb0f6
commit 17f6c25bc7
No known key found for this signature in database
GPG key ID: A96F163ED4891440
3 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
code/fgame/bg_pmove.cpp
View file

@ -1471,17 +1471,17 @@ void PmoveSingle( pmove_t *pmove )
{
if( pm->cmd.buttons & BUTTON_LEAN_LEFT )
{
if( pm->ps->fLeanAngle <= -40.0f )
if( pm->ps->fLeanAngle <= -pm->leanMax)
{
pm->ps->fLeanAngle = -40.0f;
pm->ps->fLeanAngle = -pm->leanMax;
}
else
{
float fAngle = pml.frametime * ( -40.0f - pm->ps->fLeanAngle );
float fLeanAngle = pml.frametime * -4.0f;
float fAngle = pml.frametime * ( -pm->leanMax - pm->ps->fLeanAngle ) * pm->leanAdd;
float fLeanAngle = pml.frametime * -pm->leanSpeed;
if( fAngle * 10.0f <= fLeanAngle ) {
fLeanAngle = fAngle * 10.0f;
if( fAngle <= fLeanAngle ) {
fLeanAngle = fAngle;
}
pm->ps->fLeanAngle += fLeanAngle;
@ -1489,19 +1489,19 @@ void PmoveSingle( pmove_t *pmove )
}
else
{
if( pm->ps->fLeanAngle >= 40.0f )
if( pm->ps->fLeanAngle >= pm->leanMax )
{
pm->ps->fLeanAngle = 40.0f;
pm->ps->fLeanAngle = pm->leanMax;
}
else
{
float fAngle = 40.0f - pm->ps->fLeanAngle;
float fLeanAngle = pml.frametime * 4.0f;
float fMult = pml.frametime * fAngle;
float fAngle = pm->leanMax - pm->ps->fLeanAngle;
float fLeanAngle = pml.frametime * pm->leanSpeed;
float fMult = pml.frametime * fAngle * pm->leanAdd;
if( fLeanAngle <= fMult * 10.0f )
if( fLeanAngle <= fMult )
{
fLeanAngle = fMult * 10.0f;
fLeanAngle = fMult;
}
else
{
@ -1514,11 +1514,11 @@ void PmoveSingle( pmove_t *pmove )
}
else if( pm->ps->fLeanAngle )
{
float fAngle = pm->ps->fLeanAngle * pml.frametime * 15.0f;
float fAngle = pm->ps->fLeanAngle * pml.frametime * pm->leanRecoverSpeed;
if( pm->ps->fLeanAngle <= 0.0f )
{
float fLeanAngle = -4.0f * pml.frametime;
float fLeanAngle = pml.frametime * -pm->leanSpeed;
if( fAngle <= fLeanAngle )
{
@ -1529,9 +1529,9 @@ void PmoveSingle( pmove_t *pmove )
}
else
{
float fLeanAngle = pml.frametime * 4.0f;
float fLeanAngle = pml.frametime * pm->leanSpeed;
if( fLeanAngle <= fAngle ) {
if(fAngle >= fLeanAngle) {
fLeanAngle = fAngle;
}