4 files changed, 44 insertions, 44 deletions

diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 88d9f44fc..9113ec343 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -48,9 +48,9 @@ void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickA
 	ASSERT((a_SlotNum >= 0) && (a_SlotNum < GetNumSlots()));
 
 	bool bAsync = false;
-	if (GetSlot(a_SlotNum, a_Player) == NULL)
+	if (GetSlot(a_SlotNum, a_Player) == nullptr)
 	{
-		LOGWARNING("GetSlot(%d) returned NULL! Ignoring click", a_SlotNum);
+		LOGWARNING("GetSlot(%d) returned nullptr! Ignoring click", a_SlotNum);
 		return;
 	}
 	
@@ -791,9 +791,9 @@ void cSlotAreaAnvil::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_C
 	}
 
 	bool bAsync = false;
-	if (GetSlot(a_SlotNum, a_Player) == NULL)
+	if (GetSlot(a_SlotNum, a_Player) == nullptr)
 	{
-		LOGWARNING("GetSlot(%d) returned NULL! Ignoring click", a_SlotNum);
+		LOGWARNING("GetSlot(%d) returned nullptr! Ignoring click", a_SlotNum);
 		return;
 	}
 
@@ -980,7 +980,7 @@ void cSlotAreaAnvil::OnTakeResult(cPlayer & a_Player)
 	m_ParentWindow.SetProperty(0, m_MaximumCost, a_Player);
 
 	m_MaximumCost = 0;
-	((cAnvilWindow*)&m_ParentWindow)->SetRepairedItemName("", NULL);
+	((cAnvilWindow*)&m_ParentWindow)->SetRepairedItemName("", nullptr);
 
 	int PosX, PosY, PosZ;
 	((cAnvilWindow*)&m_ParentWindow)->GetBlockPos(PosX, PosY, PosZ);
@@ -1238,9 +1238,9 @@ void cSlotAreaBeacon::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_
 	ASSERT((a_SlotNum >= 0) && (a_SlotNum < GetNumSlots()));
 
 	bool bAsync = false;
-	if (GetSlot(a_SlotNum, a_Player) == NULL)
+	if (GetSlot(a_SlotNum, a_Player) == nullptr)
 	{
-		LOGWARNING("GetSlot(%d) returned NULL! Ignoring click", a_SlotNum);
+		LOGWARNING("GetSlot(%d) returned nullptr! Ignoring click", a_SlotNum);
 		return;
 	}
 
@@ -1408,9 +1408,9 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
 	ASSERT((a_SlotNum >= 0) && (a_SlotNum < GetNumSlots()));
 
 	bool bAsync = false;
-	if (GetSlot(a_SlotNum, a_Player) == NULL)
+	if (GetSlot(a_SlotNum, a_Player) == nullptr)
 	{
-		LOGWARNING("GetSlot(%d) returned NULL! Ignoring click", a_SlotNum);
+		LOGWARNING("GetSlot(%d) returned nullptr! Ignoring click", a_SlotNum);
 		return;
 	}
 
@@ -1709,19 +1709,19 @@ cSlotAreaFurnace::~cSlotAreaFurnace()
 
 void cSlotAreaFurnace::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem)
 {
-	if (m_Furnace == NULL)
+	if (m_Furnace == nullptr)
 	{
-		LOGERROR("cSlotAreaFurnace::Clicked(): m_Furnace == NULL");
-		ASSERT(!"cSlotAreaFurnace::Clicked(): m_Furnace == NULL");
+		LOGERROR("cSlotAreaFurnace::Clicked(): m_Furnace == nullptr");
+		ASSERT(!"cSlotAreaFurnace::Clicked(): m_Furnace == nullptr");
 		return;
 	}
 
 	if (a_SlotNum == 2)
 	{
 		bool bAsync = false;
-		if (GetSlot(a_SlotNum, a_Player) == NULL)
+		if (GetSlot(a_SlotNum, a_Player) == nullptr)
 		{
-			LOGWARNING("GetSlot(%d) returned NULL! Ignoring click", a_SlotNum);
+			LOGWARNING("GetSlot(%d) returned nullptr! Ignoring click", a_SlotNum);
 			return;
 		}
 
@@ -2071,9 +2071,9 @@ void cSlotAreaArmor::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_C
 	}
 
 	bool bAsync = false;
-	if (GetSlot(a_SlotNum, a_Player) == NULL)
+	if (GetSlot(a_SlotNum, a_Player) == nullptr)
 	{
-		LOGWARNING("GetSlot(%d) returned NULL! Ignoring click", a_SlotNum);
+		LOGWARNING("GetSlot(%d) returned nullptr! Ignoring click", a_SlotNum);
 		return;
 	}
 
@@ -2223,15 +2223,15 @@ const cItem * cSlotAreaTemporary::GetSlot(int a_SlotNum, cPlayer & a_Player) con
 		LOGERROR("cSlotAreaTemporary: player \"%s\" not found for slot %d!", a_Player.GetName().c_str(), a_SlotNum);
 		ASSERT(!"cSlotAreaTemporary: player not found!");
 		
-		// Player not found, this should not happen, ever! Return NULL, but things may break by this.
-		return NULL;
+		// Player not found, this should not happen, ever! Return nullptr, but things may break by this.
+		return nullptr;
 	}
 	
 	if (a_SlotNum >= (int)(itr->second.size()))
 	{
 		LOGERROR("cSlotAreaTemporary: asking for more slots than actually stored!");
 		ASSERT(!"cSlotAreaTemporary: asking for more slots than actually stored!");
-		return NULL;
+		return nullptr;
 	}
 	
 	return &(itr->second[a_SlotNum]);
@@ -2320,7 +2320,7 @@ cItem * cSlotAreaTemporary::GetPlayerSlots(cPlayer & a_Player)
 	cItemMap::iterator itr = m_Items.find(a_Player.GetUniqueID());
 	if (itr == m_Items.end())
 	{
-		return NULL;
+		return nullptr;
 	}
 	return &(itr->second[0]);
 }
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 802d0d219..1598dd3e7 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -33,7 +33,7 @@ cWindow::cWindow(WindowType a_WindowType, const AString & a_WindowTitle) :
 	m_WindowTitle(a_WindowTitle),
 	m_IsDestroyed(false),
 	m_ShouldDistributeToHotbarFirst(true),
-	m_Owner(NULL)
+	m_Owner(nullptr)
 {
 	if (a_WindowType == wtInventory)
 	{
@@ -105,10 +105,10 @@ const cItem * cWindow::GetSlot(cPlayer & a_Player, int a_SlotNum) const
 	// Return the item at the specified slot for the specified player
 	int LocalSlotNum = 0;
 	const cSlotArea * Area = GetSlotArea(a_SlotNum, LocalSlotNum);
-	if (Area == NULL)
+	if (Area == nullptr)
 	{
-		LOGWARNING("%s: requesting item from an invalid SlotArea (SlotNum %d), returning NULL.", __FUNCTION__, a_SlotNum);
-		return NULL;
+		LOGWARNING("%s: requesting item from an invalid SlotArea (SlotNum %d), returning nullptr.", __FUNCTION__, a_SlotNum);
+		return nullptr;
 	}
 	return Area->GetSlot(LocalSlotNum, a_Player);
 }
@@ -122,7 +122,7 @@ void cWindow::SetSlot(cPlayer & a_Player, int a_SlotNum, const cItem & a_Item)
 	// Set the item to the specified slot for the specified player
 	int LocalSlotNum = 0;
 	cSlotArea * Area = GetSlotArea(a_SlotNum, LocalSlotNum);
-	if (Area == NULL)
+	if (Area == nullptr)
 	{
 		LOGWARNING("%s: requesting write to an invalid SlotArea (SlotNum %d), ignoring.", __FUNCTION__, a_SlotNum);
 		return;
@@ -177,7 +177,7 @@ void cWindow::GetSlots(cPlayer & a_Player, cItems & a_Slots) const
 		for (int i = 0; i < NumSlots; i++)
 		{
 			const cItem * Item = (*itr)->GetSlot(i, a_Player);
-			if (Item == NULL)
+			if (Item == nullptr)
 			{
 				a_Slots.push_back(cItem());
 			}
@@ -311,7 +311,7 @@ bool cWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
 	}
 
 	cClientHandle * ClientHandle = a_Player.GetClientHandle();
-	if (ClientHandle != NULL)
+	if (ClientHandle != nullptr)
 	{
 		ClientHandle->SendWindowClose(*this);
 	}
@@ -345,7 +345,7 @@ bool cWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
 
 void cWindow::OwnerDestroyed()
 {
-	m_Owner = NULL;
+	m_Owner = nullptr;
 	// Close window for each player. Note that the last one needs special handling
 	while (m_OpenedBy.size() > 1)
 	{
@@ -511,10 +511,10 @@ void cWindow::SendSlot(cPlayer & a_Player, cSlotArea * a_SlotArea, int a_Relativ
 
 void cWindow::Destroy(void)
 {
-	if (m_Owner != NULL)
+	if (m_Owner != nullptr)
 	{
 		m_Owner->CloseWindow();
-		m_Owner = NULL;
+		m_Owner = nullptr;
 	}
 	m_IsDestroyed = true;
 }
@@ -529,7 +529,7 @@ cSlotArea * cWindow::GetSlotArea(int a_GlobalSlotNum, int & a_LocalSlotNum)
 	{
 		LOGWARNING("%s: requesting an invalid SlotNum: %d out of %d slots", __FUNCTION__, a_GlobalSlotNum, GetNumSlots() - 1);
 		ASSERT(!"Invalid SlotNum");
-		return NULL;
+		return nullptr;
 	}
 	
 	// Iterate through all the SlotAreas, find the correct one
@@ -547,7 +547,7 @@ cSlotArea * cWindow::GetSlotArea(int a_GlobalSlotNum, int & a_LocalSlotNum)
 	// We shouldn't be here - the check at the beginnning should prevent this. Log and assert
 	LOGWARNING("%s: GetNumSlots() is out of sync: %d; LocalSlotNum = %d", __FUNCTION__, GetNumSlots(), LocalSlotNum);
 	ASSERT(!"Invalid GetNumSlots");
-	return NULL;
+	return nullptr;
 }
 
 
@@ -560,7 +560,7 @@ const cSlotArea * cWindow::GetSlotArea(int a_GlobalSlotNum, int & a_LocalSlotNum
 	{
 		LOGWARNING("%s: requesting an invalid SlotNum: %d out of %d slots", __FUNCTION__, a_GlobalSlotNum, GetNumSlots() - 1);
 		ASSERT(!"Invalid SlotNum");
-		return NULL;
+		return nullptr;
 	}
 	
 	// Iterate through all the SlotAreas, find the correct one
@@ -578,7 +578,7 @@ const cSlotArea * cWindow::GetSlotArea(int a_GlobalSlotNum, int & a_LocalSlotNum
 	// We shouldn't be here - the check at the beginnning should prevent this. Log and assert
 	LOGWARNING("%s: GetNumSlots() is out of sync: %d; LocalSlotNum = %d", __FUNCTION__, GetNumSlots(), LocalSlotNum);
 	ASSERT(!"Invalid GetNumSlots");
-	return NULL;
+	return nullptr;
 }
 
 
@@ -669,7 +669,7 @@ int cWindow::DistributeItemToSlots(cPlayer & a_Player, const cItem & a_Item, int
 	{
 		int LocalSlotNum = 0;
 		cSlotArea * Area = GetSlotArea(*itr, LocalSlotNum);
-		if (Area == NULL)
+		if (Area == nullptr)
 		{
 			LOGWARNING("%s: Bad SlotArea for slot %d", __FUNCTION__, *itr);
 			continue;
@@ -836,7 +836,7 @@ void cAnvilWindow::SetRepairedItemName(const AString & a_Name, cPlayer * a_Playe
 {
 	m_RepairedItemName = a_Name;
 
-	if (a_Player != NULL)
+	if (a_Player != nullptr)
 	{
 		m_AnvilSlotArea->UpdateResult(*a_Player);
 	}
@@ -963,7 +963,7 @@ cChestWindow::cChestWindow(cChestEntity * a_Chest) :
 	m_BlockY(a_Chest->GetPosY()),
 	m_BlockZ(a_Chest->GetPosZ()),
 	m_PrimaryChest(a_Chest),
-	m_SecondaryChest(NULL)
+	m_SecondaryChest(nullptr)
 {
 	m_SlotAreas.push_back(new cSlotAreaChest(a_Chest, *this));
 	m_SlotAreas.push_back(new cSlotAreaInventory(*this));
@@ -1014,7 +1014,7 @@ void cChestWindow::OpenedByPlayer(cPlayer & a_Player)
 	cChunkDef::BlockToChunk(m_PrimaryChest->GetPosX(), m_PrimaryChest->GetPosZ(), ChunkX, ChunkZ);
 	m_PrimaryChest->GetWorld()->MarkRedstoneDirty(ChunkX, ChunkZ);
 
-	if (m_SecondaryChest != NULL)
+	if (m_SecondaryChest != nullptr)
 	{
 		m_SecondaryChest->SetNumberOfPlayers(m_SecondaryChest->GetNumberOfPlayers() + 1);
 		cChunkDef::BlockToChunk(m_SecondaryChest->GetPosX(), m_SecondaryChest->GetPosZ(), ChunkX, ChunkZ);
@@ -1036,7 +1036,7 @@ bool cChestWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
 	cChunkDef::BlockToChunk(m_PrimaryChest->GetPosX(), m_PrimaryChest->GetPosZ(), ChunkX, ChunkZ);
 	m_PrimaryChest->GetWorld()->MarkRedstoneDirty(ChunkX, ChunkZ);
 
-	if (m_SecondaryChest != NULL)
+	if (m_SecondaryChest != nullptr)
 	{
 		m_SecondaryChest->SetNumberOfPlayers(m_SecondaryChest->GetNumberOfPlayers() - 1);
 		cChunkDef::BlockToChunk(m_SecondaryChest->GetPosX(), m_SecondaryChest->GetPosZ(), ChunkX, ChunkZ);
diff --git a/src/UI/Window.h b/src/UI/Window.h
index 26dd7f125..e62176d50 100644
--- a/src/UI/Window.h
+++ b/src/UI/Window.h
@@ -90,7 +90,7 @@ public:
 	
 	// tolua_begin
 	
-	/// Returns the item at the specified slot for the specified player. Returns NULL if invalid SlotNum requested
+	/// Returns the item at the specified slot for the specified player. Returns nullptr if invalid SlotNum requested
 	const cItem * GetSlot(cPlayer & a_Player, int a_SlotNum) const;
 	
 	/// Sets the item to the specified slot for the specified player
@@ -189,13 +189,13 @@ protected:
 	
 	/** Returns the correct slot area for the specified window-global SlotNum
 	Also returns the area-local SlotNum corresponding to the GlobalSlotNum
-	If the global SlotNum is out of range, returns NULL
+	If the global SlotNum is out of range, returns nullptr
 	*/
 	cSlotArea * GetSlotArea(int a_GlobalSlotNum, int & a_LocalSlotNum);
 	
 	/** Returns the correct slot area for the specified window-global SlotNum
 	Also returns the area-local SlotNum corresponding to the GlobalSlotNum
-	If the global SlotNum is out of range, returns NULL.
+	If the global SlotNum is out of range, returns nullptr.
 	Const version.
 	*/
 	const cSlotArea * GetSlotArea(int a_GlobalSlotNum, int & a_LocalSlotNum) const;
diff --git a/src/UI/WindowOwner.h b/src/UI/WindowOwner.h
index 6845a161b..4dc3cf080 100644
--- a/src/UI/WindowOwner.h
+++ b/src/UI/WindowOwner.h
@@ -22,7 +22,7 @@ class cWindowOwner
 {
 public:
 	cWindowOwner() :
-		m_Window(NULL)
+		m_Window(nullptr)
 	{
 	}
 
@@ -32,7 +32,7 @@ public:
 
 	void CloseWindow(void)
 	{
-		m_Window = NULL;
+		m_Window = nullptr;
 	}
 
 	void OpenWindow(cWindow * a_Window)