diff --git a/src/osgPlugins/txp/trpage_managers.cpp b/src/osgPlugins/txp/trpage_managers.cpp index 525f65cc7..079a0e832 100644 --- a/src/osgPlugins/txp/trpage_managers.cpp +++ b/src/osgPlugins/txp/trpage_managers.cpp @@ -1022,7 +1022,7 @@ void *trpgr_ChildRefCB::Parse(trpgToken tok, trpgReadBuffer& rbuf) if(childRef.Read(rbuf)) return &childRef; else - return false; + return 0; } else diff --git a/src/osgPlugins/txp/trpage_material.cpp b/src/osgPlugins/txp/trpage_material.cpp index 2140cfbea..01f0deda2 100644 --- a/src/osgPlugins/txp/trpage_material.cpp +++ b/src/osgPlugins/txp/trpage_material.cpp @@ -224,7 +224,7 @@ const trpgMaterial *trpgMatTable::GetMaterialRef(int nt,int nm) const { MaterialMapType::const_iterator itr = materialMap.find((nt*numMat)+nm); if(itr == materialMap.end()) - return false; + return 0; return const_cast(&(*itr).second); } @@ -1744,10 +1744,10 @@ bool trpgTexTable::GetTexture(int id,trpgTexture &ret) const const trpgTexture *trpgTexTable::GetTextureRef(int id) const { if (id < 0) - return false; + return 0; TextureMapType::const_iterator itr = textureMap.find(id); if(itr == textureMap.end()) { - return false; + return 0; } const trpgTexture *ret = &(itr->second); return ret; @@ -1766,7 +1766,7 @@ const trpgTexture *trpgTexTable::FindByName(const char *name, int &texid) const return &(itr->second); } } - return false; + return 0; } diff --git a/src/osgPlugins/txp/trpage_model.cpp b/src/osgPlugins/txp/trpage_model.cpp index acf09a08e..af3d60231 100644 --- a/src/osgPlugins/txp/trpage_model.cpp +++ b/src/osgPlugins/txp/trpage_model.cpp @@ -432,7 +432,7 @@ trpgModel *trpgModelTable::GetModelRef(int id) //return &models[id]; ModelMapType::iterator itr = modelsMap.find(id); if(itr == modelsMap.end()) { - return false; + return 0; } return &(itr->second); }