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, 7 insertions, 7 deletions

diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
index f01db84e..06e73d6f 100644
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
@@ -61,9 +61,9 @@ void ChangeStateConstraint::tick(int iPad)
 				// Send update settings packet to server
 				Minecraft *pMinecraft = Minecraft::GetInstance();				
 				shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
-				if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
+				if(player != nullptr && player->connection && player->connection->getNetworkPlayer() != nullptr)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs));
 				}
 			}
 		}
@@ -89,7 +89,7 @@ void ChangeStateConstraint::tick(int iPad)
 
 		if(m_changeGameMode)
 		{
-			if(minecraft->localgameModes[iPad] != NULL)
+			if(minecraft->localgameModes[iPad] != nullptr)
 			{
 				m_changedFromGameMode = minecraft->localplayers[iPad]->abilities.instabuild ? GameType::CREATIVE : GameType::SURVIVAL;
 
@@ -102,9 +102,9 @@ void ChangeStateConstraint::tick(int iPad)
 					// Send update settings packet to server
 					Minecraft *pMinecraft = Minecraft::GetInstance();				
 					shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
-					if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
+					if(player != nullptr && player->connection && player->connection->getNetworkPlayer() != nullptr)
 					{
-						player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
+						player->connection->send(std::make_shared<PlayerInfoPacket>(player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs));
 					}
 				}
 			}
@@ -126,9 +126,9 @@ void ChangeStateConstraint::tick(int iPad)
 				// Send update settings packet to server
 				Minecraft *pMinecraft = Minecraft::GetInstance();				
 				shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
-				if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
+				if(player != nullptr && player->connection && player->connection->getNetworkPlayer() != nullptr)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs));
 				}
 			}
 		}