Make sure the pointer is not being used after deletion, and tie the elapsed time to the particular class instance.
This commit is contained in:
parent
9e72a38165
commit
c542be5330
3 changed files with 19 additions and 10 deletions
|
@ -51,7 +51,9 @@ bool FGAIBallistic::init() {
|
|||
|
||||
void FGAIBallistic::bind() {
|
||||
// FGAIBase::bind();
|
||||
props->tie("sim/time/elapsed-sec", SGRawValuePointer<double>(&(this->life_timer)));
|
||||
props->tie("sim/time/elapsed-sec",
|
||||
SGRawValueMethods<FGAIBallistic,double>(*this,
|
||||
&FGAIBallistic::_getTime));
|
||||
}
|
||||
|
||||
void FGAIBallistic::unbind() {
|
||||
|
@ -163,3 +165,8 @@ void FGAIBallistic::Run(double dt) {
|
|||
if (altitude < -1000.0) setDie(true);
|
||||
|
||||
}
|
||||
|
||||
double FGAIBallistic::_getTime() const {
|
||||
return life_timer;
|
||||
}
|
||||
|
||||
|
|
|
@ -42,9 +42,11 @@ public:
|
|||
void setDragArea( double a );
|
||||
void setLife( double seconds );
|
||||
void setBuoyancy( double fpss );
|
||||
void setWind_from_east( double fps );
|
||||
void setWind_from_north( double fps );
|
||||
void setWind( bool val );
|
||||
void setWind_from_east( double fps );
|
||||
void setWind_from_north( double fps );
|
||||
void setWind( bool val );
|
||||
|
||||
double _getTime() const;
|
||||
|
||||
private:
|
||||
|
||||
|
@ -54,11 +56,11 @@ private:
|
|||
bool aero_stabilized; // if true, object will point where it's going
|
||||
double drag_area; // equivalent drag area in ft2
|
||||
double life_timer; // seconds
|
||||
double gravity; // fps2
|
||||
double buoyancy; // fps2
|
||||
double wind_from_east; // fps
|
||||
double wind_from_north; // fps
|
||||
bool wind; // if true, local wind will be applied to object
|
||||
double gravity; // fps2
|
||||
double buoyancy; // fps2
|
||||
double wind_from_east; // fps
|
||||
double wind_from_north; // fps
|
||||
bool wind; // if true, local wind will be applied to object
|
||||
|
||||
void Run(double dt);
|
||||
};
|
||||
|
|
|
@ -95,9 +95,9 @@ void FGAIManager::update(double dt) {
|
|||
ai_list_itr = ai_list.begin();
|
||||
while(ai_list_itr != ai_list.end()) {
|
||||
if ((*ai_list_itr)->getDie()) {
|
||||
delete (*ai_list_itr);
|
||||
--numObjects[(*ai_list_itr)->getType()];
|
||||
--numObjects[0];
|
||||
delete (*ai_list_itr);
|
||||
if ( ai_list_itr == ai_list.begin() ) {
|
||||
ai_list.erase(ai_list_itr);
|
||||
ai_list_itr = ai_list.begin();
|
||||
|
|
Loading…
Add table
Reference in a new issue