Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix] nullptr dereferencing in calcAnimators #512

Merged
merged 2 commits into from Jan 4, 2016
Merged

[Bugfix] nullptr dereferencing in calcAnimators #512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51d80a
[Bugfix] nullptr dereferencing in calcAnimators
ulteq Dec 22, 2015
28d1fda
[Codechange] Different solution for the calcAnimators issue
ulteq Dec 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 19 additions & 19 deletions source/main/physics/Beam.cpp
View file
Open in desktop
Expand Up @@ -1912,9 +1912,9 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//torque
if (flag_state & ANIM_FLAG_TORQUE)
if (engine && flag_state & ANIM_FLAG_TORQUE)
{
float torque=engine->getCrankFactor();
float torque = engine->getCrankFactor();
if (torque <= 0.0f) torque = 0.0f;
if (torque >= previousCrank)
cstate -= torque / 10.0f;
Expand All @@ -1927,12 +1927,12 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//shifterseq, to amimate sequentiell shifting
if ((flag_state & ANIM_FLAG_SHIFTER) && option3 == 3.0f)
if (engine && (flag_state & ANIM_FLAG_SHIFTER) && option3 == 3.0f)
{
// opt1 &opt2 = 0 this is a shifter
if (!option1 && !option2)
{
int shifter=engine->getGear();
int shifter = engine->getGear();
if (shifter > previousGear)
{
cstate = 1.0f;
Expand Down Expand Up @@ -1973,9 +1973,9 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//shifterman1, left/right
if ((flag_state & ANIM_FLAG_SHIFTER) && option3 == 1.0f)
if (engine && (flag_state & ANIM_FLAG_SHIFTER) && option3 == 1.0f)
{
int shifter=engine->getGear();
int shifter = engine->getGear();
if (!shifter)
{
cstate = -0.5f;
Expand All @@ -1991,9 +1991,9 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//shifterman2, up/down
if ((flag_state & ANIM_FLAG_SHIFTER) && option3 == 2.0f)
if (engine && (flag_state & ANIM_FLAG_SHIFTER) && option3 == 2.0f)
{
int shifter=engine->getGear();
int shifter = engine->getGear();
cstate = 0.5f;
if (shifter < 0)
{
Expand All @@ -2007,10 +2007,10 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//shifterlinear, to amimate cockpit gearselect gauge and autotransmission stick
if ((flag_state & ANIM_FLAG_SHIFTER) && option3 == 4.0f)
if (engine && (flag_state & ANIM_FLAG_SHIFTER) && option3 == 4.0f)
{
int shifter=engine->getGear();
int numgears=engine->getNumGears();
int shifter = engine->getGear();
int numgears = engine->getNumGears();
cstate -= (shifter + 2.0) / (numgears + 2.0);
div++;
}
Expand All @@ -2032,17 +2032,17 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//engine tacho ( scales with maxrpm, default is 3500 )
if (flag_state & ANIM_FLAG_TACHO)
if (engine && flag_state & ANIM_FLAG_TACHO)
{
float tacho=engine->getRPM()/engine->getMaxRPM();
float tacho = engine->getRPM()/engine->getMaxRPM();
cstate -= tacho;
div++;
}

//turbo
if (flag_state & ANIM_FLAG_TURBO)
if (engine && flag_state & ANIM_FLAG_TURBO)
{
float turbo=engine->getTurboPSI()*3.34;
float turbo = engine->getTurboPSI()*3.34;
cstate -= turbo / 67.0f ;
div++;
}
Expand All @@ -2056,18 +2056,18 @@ void Beam::calcAnimators(int flagstate, float &cstate, int &div, Real timer, flo
}

//accelerator
if (flag_state & ANIM_FLAG_ACCEL)
if (engine && flag_state & ANIM_FLAG_ACCEL)
{
float accel=engine->getAcc();
float accel = engine->getAcc();
cstate -= accel + 0.06f;
//( small correction, get acc is nver smaller then 0.06.
div++;
}

//clutch
if (flag_state & ANIM_FLAG_CLUTCH)
if (engine && flag_state & ANIM_FLAG_CLUTCH)
{
float clutch=engine->getClutch();
float clutch = engine->getClutch();
cstate -= abs(1.0f - clutch);
div++;
}
Expand Down