mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
c14d0733c9
2 changed files with 4 additions and 2 deletions
|
@ -1421,7 +1421,7 @@ void CPrimitiveWorldImage::setGlobalPosition (const UGlobalPosition& pos, CMoveC
|
||||||
void CPrimitiveWorldImage::setGlobalPosition (const NLMISC::CVectorD& pos, CMoveContainer& container, CMovePrimitive &primitive, uint8 worldImage, bool keepZ /*= false*/, UGlobalPosition::TType type /* =UGlobalPosition::Unspecified*/)
|
void CPrimitiveWorldImage::setGlobalPosition (const NLMISC::CVectorD& pos, CMoveContainer& container, CMovePrimitive &primitive, uint8 worldImage, bool keepZ /*= false*/, UGlobalPosition::TType type /* =UGlobalPosition::Unspecified*/)
|
||||||
{
|
{
|
||||||
// Cast type
|
// Cast type
|
||||||
nlassert (dynamic_cast<const CMoveContainer*>(&container));
|
nlassert (dynamic_cast<const CMoveContainer*>(&container) != NULL);
|
||||||
const CMoveContainer *cont=(const CMoveContainer*)&container;
|
const CMoveContainer *cont=(const CMoveContainer*)&container;
|
||||||
|
|
||||||
// Get the retriever
|
// Get the retriever
|
||||||
|
|
|
@ -164,7 +164,9 @@ void readFormId( string& outputFileName )
|
||||||
map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
|
map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
|
||||||
if( itFT == FileTypeToId.end() )
|
if( itFT == FileTypeToId.end() )
|
||||||
{
|
{
|
||||||
FileTypeToId.insert( std::pair<std::string, uint8>(fileType,fid.FormIDInfos.Type) );
|
uint8 type = (uint8)fid.FormIDInfos.Type;
|
||||||
|
|
||||||
|
FileTypeToId.insert( std::pair<std::string, uint8>(fileType, type) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue