Deleted few macros

Author: Przemog1

include/ESceneNodeTypes.h

@@ -20,45 +20,45 @@ namespace scene
 	enum ESCENE_NODE_TYPE
 	{
 		//! of type CSceneManager (note that ISceneManager is not(!) an ISceneNode)
-		ESNT_SCENE_MANAGER	= MAKE_NBL_ID('s','m','n','g'),
+		ESNT_SCENE_MANAGER,
 
 		//! Sky Box Scene Node
-		ESNT_SKY_BOX        = MAKE_NBL_ID('s','k','y','_'),
+		ESNT_SKY_BOX,
 
 		//! Sky Dome Scene Node
-		ESNT_SKY_DOME       = MAKE_NBL_ID('s','k','y','d'),
+		ESNT_SKY_DOME,
 
 		//! Mesh Scene Node
-		ESNT_MESH           = MAKE_NBL_ID('m','e','s','h'),
-		ESNT_MESH_INSTANCED = MAKE_NBL_ID('m','b','f','I'),
+		ESNT_MESH,
+		ESNT_MESH_INSTANCED,
 
 		//! Dummy Transformation Scene Node
-		ESNT_DUMMY_TRANSFORMATION = MAKE_NBL_ID('d','m','m','y'),
+		ESNT_DUMMY_TRANSFORMATION,
 
 		//! Camera Scene Node
-		ESNT_CAMERA         = MAKE_NBL_ID('c','a','m','_'),
+		ESNT_CAMERA,
 
 		//! Animated Mesh Scene Node
-		ESNT_ANIMATED_MESH  = MAKE_NBL_ID('a','m','s','h'),
-		ESNT_ANIMATED_MESH_INSTANCED = MAKE_NBL_ID('a','m','s','I'),
+		ESNT_ANIMATED_MESH,
+		ESNT_ANIMATED_MESH_INSTANCED,
 
 		//! Skinned Mesh Scene Node
-		ESNT_SKINNED_MESH  = MAKE_NBL_ID('s','m','s','h'),
-		ESNT_SKINNED_MESH_INSTANCED = MAKE_NBL_ID('s','m','s','I'),
+		ESNT_SKINNED_MESH,
+		ESNT_SKINNED_MESH_INSTANCED,
 
 		//! Maya Camera Scene Node
 		/** Legacy, for loading version <= 1.4.x .irr files */
-		ESNT_CAMERA_MAYA    = MAKE_NBL_ID('c','a','m','M'),
+		ESNT_CAMERA_MAYA,
 
 		//! First Person Shooter Camera
 		/** Legacy, for loading version <= 1.4.x .irr files */
-		ESNT_CAMERA_FPS     = MAKE_NBL_ID('c','a','m','F'),
+		ESNT_CAMERA_FPS,
 
 		//! Unknown scene node
-		ESNT_UNKNOWN        = MAKE_NBL_ID('u','n','k','n'),
+		ESNT_UNKNOWN,
 
 		//! Will match with any scene node when checking types
-		ESNT_ANY            = MAKE_NBL_ID('a','n','y','_')
+		ESNT_ANY           
 	};
 
 

include/IFileArchive.h

@@ -26,22 +26,22 @@ enum EFileSystemType
 enum E_FILE_ARCHIVE_TYPE
 {
 	//! A PKZIP archive
-	EFAT_ZIP     = MAKE_NBL_ID('Z','I','P', 0),
+	EFAT_ZIP,
 
 	//! A gzip archive
-	EFAT_GZIP    = MAKE_NBL_ID('g','z','i','p'),
+	EFAT_GZIP,
 
 	//! A virtual directory
-	EFAT_FOLDER  = MAKE_NBL_ID('f','l','d','r'),
+	EFAT_FOLDER,
 
 	//! An ID Software PAK archive
-	EFAT_PAK     = MAKE_NBL_ID('P','A','K', 0),
+	EFAT_PAK,
 
 	//! A Tape ARchive
-	EFAT_TAR     = MAKE_NBL_ID('T','A','R', 0),
+	EFAT_TAR,
 
 	//! The type of this archive is unknown
-	EFAT_UNKNOWN = MAKE_NBL_ID('u','n','k','n')
+	EFAT_UNKNOWN
 };
 
 //! The FileArchive manages archives and provides access to files inside them.

include/IFileSystem.h

@@ -329,7 +329,7 @@ class IFileSystem : public virtual core::IReferenceCounted
 			{
 				subdir = directory.subString(lastpos, pos - lastpos + 1);
 
-				if (subdir == _NBL_TEXT("../"))
+				if (subdir == "../")
 				{
 					if (lastWasRealDir)
 					{
@@ -342,11 +342,11 @@ class IFileSystem : public virtual core::IReferenceCounted
 						lastWasRealDir = false;
 					}
 				}
-				else if (subdir == _NBL_TEXT("/"))
+				else if (subdir == "/")
 				{
 					dir = root;
 				}
-				else if (subdir != _NBL_TEXT("./"))
+				else if (subdir != "./")
 				{
 					dir.append(subdir);
 					lastWasRealDir = true;

include/nbl/core/Types.h

@@ -104,13 +104,6 @@ typedef std::mutex  fast_mutex;
 
 #endif // _NBL_WINDOWS_API_
 
-
-
-#define _NBL_TEXT(X) X
-
-
-
-
 // memory debugging
 #if defined(_NBL_DEBUG) && defined(NABLA_EXPORTS) && defined(_MSC_VER) && \
 	(_MSC_VER > 1299) && !defined(_NBL_DONT_DO_MEMORY_DEBUGGING_HERE) && !defined(_WIN32_WCE)
@@ -123,26 +116,5 @@ typedef std::mutex  fast_mutex;
 	#define new DEBUG_CLIENTBLOCK
 #endif
 
-
-//! ignore VC8 warning deprecated
-/** The microsoft compiler */
-#if defined(_NBL_WINDOWS_API_) && defined(_MSC_VER) && (_MSC_VER >= 1400)
-	//#pragma warning( disable: 4996)
-	//#define _CRT_SECURE_NO_DEPRECATE 1
-	//#define _CRT_NONSTDC_NO_DEPRECATE 1
-#endif
-
-
-//! creates four CC codes used in Irrlicht for simple ids
-/** some compilers can create those by directly writing the
-code like 'code', but some generate warnings so we use this macro here */
-#define MAKE_NBL_ID(c0, c1, c2, c3) \
-		((uint32_t)(uint8_t)(c0) | ((uint32_t)(uint8_t)(c1) << 8) | \
-		((uint32_t)(uint8_t)(c2) << 16) | ((uint32_t)(uint8_t)(c3) << 24 ))
-
-#if defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
-#define _strcmpi(a,b) strcmpi(a,b)
-#endif
-
 #endif
 

source/Nabla/CFileSystem.cpp

@@ -313,7 +313,7 @@ bool CFileSystem::changeArchivePassword(const path& filename,
 		// We need to check for directory names with trailing slash and without
 		const path absPath = getAbsolutePath(filename);
 		const path arcPath = FileArchives[idx]->getFileList()->getPath();
-		if ((absPath == arcPath) || ((absPath+_NBL_TEXT("/")) == arcPath))
+		if ((absPath == arcPath) || ((absPath+"/") == arcPath))
 		{
 			if (password.size())
 				FileArchives[idx]->Password=password;
@@ -553,7 +553,7 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory)
 	{
 		WorkingDirectory[FILESYSTEM_VIRTUAL] = newDirectory;
 		// is this empty string constant really intended?
-		WorkingDirectory[FILESYSTEM_VIRTUAL] = flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], _NBL_TEXT(""));
+		WorkingDirectory[FILESYSTEM_VIRTUAL] = flattenFilename(WorkingDirectory[FILESYSTEM_VIRTUAL], "");
 		success = true;
 	}
 	else
@@ -660,8 +660,8 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director
 	core::splitFilename(getAbsolutePath(filename), &path1, &file, &ext);
 	io::path path2(getAbsolutePath(directory));
 	core::list<io::path> list1, list2;
-	path1.split(list1, _NBL_TEXT("/\\"), 2);
-	path2.split(list2, _NBL_TEXT("/\\"), 2);
+	path1.split(list1, "/\\", 2);
+	path2.split(list2, "/\\", 2);
 	uint32_t i=0;
 	core::list<io::path>::const_iterator it1,it2;
 	it1=list1.begin();
@@ -674,9 +674,9 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director
 		prefix1 = *it1;
 	if ( it2 != list2.end() )
 		prefix2 = *it2;
-	if ( prefix1.size() > 1 && prefix1[1] == _NBL_TEXT(':') )
+	if ( prefix1.size() > 1 && prefix1[1] == ':' )
 		partition1 = core::locale_lower(prefix1[0]);
-	if ( prefix2.size() > 1 && prefix2[1] == _NBL_TEXT(':') )
+	if ( prefix2.size() > 1 && prefix2[1] == ':' )
 		partition2 = core::locale_lower(prefix2[0]);
 
 	// must have the same prefix or we can't resolve it to a relative filename
@@ -698,18 +698,18 @@ path CFileSystem::getRelativeFilename(const path& filename, const path& director
 		++it1;
 		++it2;
 	}
-	path1=_NBL_TEXT("");
+	path1="";
 	for (; i<list2.size(); ++i)
-		path1 += _NBL_TEXT("../");
+		path1 += "../";
 	while (it1 != list1.end())
 	{
 		path1.append(*it1++);
-		path1.append(_NBL_TEXT('/'));
+		path1.append('/');
 	}
 	path1 += file;
 	if (ext.size())
 	{
-		path1.append(_NBL_TEXT('.'));
+		path1.append('.');
 		path1 += ext;
 	}
 	return path1;
@@ -824,10 +824,10 @@ IFileList* CFileSystem::createFileList()
 		SFileListEntry e3;
 
 		//! PWD
-		r->addItem(Path + _NBL_TEXT("."), 0, 0, true, 0);
+		r->addItem(Path + ".", 0, 0, true, 0);
 
 		//! parent
-		r->addItem(Path + _NBL_TEXT(".."), 0, 0, true, 0);
+		r->addItem(Path + "..", 0, 0, true, 0);
 
 		//! merge archives
 		for (uint32_t i=0; i < FileArchives.size(); ++i)