Revert "Project modernization (#630)"

This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.

1 files changed, 10 insertions, 10 deletions

diff --git a/Minecraft.World/EntityIO.cpp b/Minecraft.World/EntityIO.cpp
index 9c7c64d4..086015dc 100644
--- a/Minecraft.World/EntityIO.cpp
+++ b/Minecraft.World/EntityIO.cpp
@@ -135,8 +135,8 @@ shared_ptr<Entity> EntityIO::newEntity(const wstring& id, Level *level)
 	if(it != idCreateMap->end() )
 	{
 		entityCreateFn create = it->second;
-		if (create != nullptr) entity = shared_ptr<Entity>(create(level));
-		if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
+		if (create != NULL) entity = shared_ptr<Entity>(create(level));
+		if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
 		{
 			dynamic_pointer_cast<EnderDragon>(entity)->AddParts();		// 4J added to finalise creation
 		}
@@ -173,14 +173,14 @@ shared_ptr<Entity> EntityIO::loadStatic(CompoundTag *tag, Level *level)
 	if(it != idCreateMap->end() )
 	{
 		entityCreateFn create = it->second;
-		if (create != nullptr) entity = shared_ptr<Entity>(create(level));
-		if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
+		if (create != NULL) entity = shared_ptr<Entity>(create(level));
+		if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
 		{
 			dynamic_pointer_cast<EnderDragon>(entity)->AddParts();		// 4J added to finalise creation
 		}
 	}
 
-	if (entity != nullptr)
+	if (entity != NULL)
 	{
 		entity->load(tag);
 	}
@@ -201,14 +201,14 @@ shared_ptr<Entity> EntityIO::newById(int id, Level *level)
 	if(it != numCreateMap->end() )
 	{
 		entityCreateFn create = it->second;
-		if (create != nullptr) entity = shared_ptr<Entity>(create(level));
-		if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
+		if (create != NULL) entity = shared_ptr<Entity>(create(level));
+		if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
 		{
 			dynamic_pointer_cast<EnderDragon>(entity)->AddParts();		// 4J added to finalise creation
 		}
 	}
 
-	if (entity != nullptr)
+	if (entity != NULL)
 	{
 	}
 	else
@@ -229,8 +229,8 @@ shared_ptr<Entity> EntityIO::newByEnumType(eINSTANCEOF eType, Level *level)
 		if(it2 != numCreateMap->end() )
 		{
 			entityCreateFn create = it2->second;
-			if (create != nullptr) entity = shared_ptr<Entity>(create(level));
-			if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
+			if (create != NULL) entity = shared_ptr<Entity>(create(level));
+			if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
 			{
 				dynamic_pointer_cast<EnderDragon>(entity)->AddParts();		// 4J added to finalise creation
 			}