Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-12-11 19:27:27 +01:00
parent 861a9b399a
commit 5acd03d77d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/pacs/primitive_world_image.cpp
View file

@ -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*/)
{
// Cast type
nlassert (dynamic_cast<const CMoveContainer*>(&container));
nlassert (dynamic_cast<const CMoveContainer*>(&container) != NULL);
const CMoveContainer *cont=(const CMoveContainer*)&container;
// Get the retriever

4
code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
View file

@ -164,7 +164,9 @@ void readFormId( string& outputFileName )
map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
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