Project modernization (#630)

* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides

1 files changed, 10 insertions, 10 deletions

diff --git a/Minecraft.Client/TileEntityRenderDispatcher.cpp b/Minecraft.Client/TileEntityRenderDispatcher.cpp
index 887663fe..5a1519c7 100644
--- a/Minecraft.Client/TileEntityRenderDispatcher.cpp
+++ b/Minecraft.Client/TileEntityRenderDispatcher.cpp
@@ -15,7 +15,7 @@
 #include "EnderChestRenderer.h"
 #include "BeaconRenderer.h"
 
-TileEntityRenderDispatcher *TileEntityRenderDispatcher::instance = NULL;
+TileEntityRenderDispatcher *TileEntityRenderDispatcher::instance = nullptr;
 double TileEntityRenderDispatcher::xOff = 0;
 double TileEntityRenderDispatcher::yOff = 0;
 double TileEntityRenderDispatcher::zOff = 0;
@@ -28,9 +28,9 @@ void TileEntityRenderDispatcher::staticCtor()
 TileEntityRenderDispatcher::TileEntityRenderDispatcher()
 {
 	// 4J -a dded
-	font = NULL;
-	textures = NULL;
-	level = NULL;
+	font = nullptr;
+	textures = nullptr;
+	level = nullptr;
 	cameraEntity = nullptr;
 	playerRotY = 0.0f;
 	playerRotX = 0.0f;;
@@ -45,7 +45,7 @@ TileEntityRenderDispatcher::TileEntityRenderDispatcher()
 	renderers[eTYPE_ENCHANTMENTTABLEENTITY] = new EnchantTableRenderer();
 	renderers[eTYPE_THEENDPORTALTILEENTITY] = new TheEndPortalRenderer();
 	renderers[eTYPE_SKULLTILEENTITY] = new SkullTileRenderer();
-	renderers[eTYPE_FURNACETILEENTITY] = NULL;
+	renderers[eTYPE_FURNACETILEENTITY] = nullptr;
 	renderers[eTYPE_BEACONTILEENTITY] = new BeaconRenderer();
 	glDisable(GL_LIGHTING);
 
@@ -57,13 +57,13 @@ TileEntityRenderDispatcher::TileEntityRenderDispatcher()
 
 TileEntityRenderer *TileEntityRenderDispatcher::getRenderer(eINSTANCEOF e)
 {
-	TileEntityRenderer *r = NULL;
+	TileEntityRenderer *r = nullptr;
 	//TileEntityRenderer *r = renderers[e];
     auto it = renderers.find(e); // 4J Stu - The .at and [] accessors insert elements if they don't exist
 
     if( it == renderers.end() )
 	{
-		return NULL;
+		return nullptr;
 	}
 
 /* 4J - not doing this hierarchical search anymore. We need to explicitly add renderers for any eINSTANCEOF type that we want to be able to render
@@ -83,12 +83,12 @@ TileEntityRenderer *TileEntityRenderDispatcher::getRenderer(eINSTANCEOF e)
 
 bool TileEntityRenderDispatcher::hasRenderer(shared_ptr<TileEntity> e)
 {
-	return getRenderer(e) != NULL;
+	return getRenderer(e) != nullptr;
 }
 
 TileEntityRenderer *TileEntityRenderDispatcher::getRenderer(shared_ptr<TileEntity> e)
 {
-	if (e == NULL) return NULL;
+	if (e == nullptr) return nullptr;
 	return getRenderer(e->GetType());
 }
 
@@ -135,7 +135,7 @@ void TileEntityRenderDispatcher::render(shared_ptr<TileEntity> e, float a, bool
 void TileEntityRenderDispatcher::render(shared_ptr<TileEntity> entity, double x, double y, double z, float a, bool setColor/*=true*/, float alpha, bool useCompiled)
 {
 	TileEntityRenderer *renderer = getRenderer(entity);
-	if (renderer != NULL)
+	if (renderer != nullptr)
 	{
 		renderer->render(entity, x, y, z, a, setColor, alpha, useCompiled);
 	}