From c97de63db93e0e803dbf1f16d44d1597fc20ab01 Mon Sep 17 00:00:00 2001 From: till busch Date: Sat, 22 Mar 2008 09:25:55 +0100 Subject: [PATCH] modelpaging v0.4.4.2 (incremetal) - flightgear nit-picking cosmetics --- src/AIModel/AIBase.cxx | 4 ++-- src/AIModel/AIModelData.cxx | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx index e8d674a..391cc57 100644 --- a/src/AIModel/AIBase.cxx +++ b/src/AIModel/AIBase.cxx @@ -174,7 +174,7 @@ bool FGAIBase::init(bool search_in_AI_path) { model = load3DModel(f, props); - if (model.get()) { + if (model.valid()) { model->setNodeMask(model->getNodeMask() & ~SG_NODEMASK_TERRAIN_BIT); aip.init( model.get() ); aip.setVisible(true); @@ -191,7 +191,7 @@ bool FGAIBase::init(bool search_in_AI_path) { void FGAIBase::initModel(osg::Node *node) { - if (model.get()) { + if (model.valid()) { fgSetString("/ai/models/model-added", props->getPath()); } else if (!model_path.empty()) { diff --git a/src/AIModel/AIModelData.cxx b/src/AIModel/AIModelData.cxx index c946d33..fe4762e 100644 --- a/src/AIModel/AIModelData.cxx +++ b/src/AIModel/AIModelData.cxx @@ -6,7 +6,6 @@ void FGAIModelData::modelLoaded(const string& path, SGPropertyNode *prop, { FGNasalModelData::modelLoaded(path, prop, n); // SG_LOG(SG_NASAL, SG_ALERT, "FGAIModelData::modelLoaded(" << path << ")"); - if(!_base) - return; - _base->initModel(n); + if(_base.valid()) + _base->initModel(n); } -- 1.5.2.5