From 5acd03d77d103aed836835a144dcb1e8c65df3d5 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 11 Dec 2016 19:27:27 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/src/pacs/primitive_world_image.cpp         | 2 +-
 code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/nel/src/pacs/primitive_world_image.cpp b/code/nel/src/pacs/primitive_world_image.cpp
index b669bbfe7..22cf2cee2 100644
--- a/code/nel/src/pacs/primitive_world_image.cpp
+++ b/code/nel/src/pacs/primitive_world_image.cpp
@@ -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
diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
index a8e095db3..c6accc1cb 100644
--- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
+++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
@@ -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