Merge branch 'smartcmd:main' into main

1 files changed, 6 insertions, 6 deletions

diff --git a/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.cpp b/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.cpp
index 1327a6d6..7265eb04 100644
--- a/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.cpp
+++ b/Minecraft.Client/PSVita/PSVitaExtras/CustomMap.cpp
@@ -4,12 +4,12 @@
 
 CustomMap::CustomMap()
 {
-	m_NodePool = NULL;
+	m_NodePool = nullptr;
 	m_NodePoolSize = 0;
 	m_NodePoolIndex = 0;
 
 	m_HashSize = 1024;
-	m_HashTable = (SCustomMapNode**) malloc(m_HashSize * sizeof(SCustomMapNode));
+	m_HashTable = static_cast<SCustomMapNode **>(malloc(m_HashSize * sizeof(SCustomMapNode)));
 
 	clear();
 }
@@ -87,7 +87,7 @@ void CustomMap::insert(const ChunkPos &Key, bool Value)
 	Node->Hash = Hash;
 	Node->first = Key;
 	Node->second = Value;
-	Node->Next = NULL;
+	Node->Next = nullptr;
 
 	// are any nodes in this hash index
 	if( !m_HashTable[Index] )
@@ -115,16 +115,16 @@ void CustomMap::resize()
 	SCustomMapNode **NodePool;
 	if( m_NodePool )
 	{
-		NodePool = (SCustomMapNode**) realloc(m_NodePool, m_NodePoolSize * sizeof(SCustomMapNode));
+		NodePool = static_cast<SCustomMapNode **>(realloc(m_NodePool, m_NodePoolSize * sizeof(SCustomMapNode)));
 	}
 	else
 	{
-		NodePool = (SCustomMapNode**) malloc(m_NodePoolSize * sizeof(SCustomMapNode));
+		NodePool = static_cast<SCustomMapNode **>(malloc(m_NodePoolSize * sizeof(SCustomMapNode)));
 	}
 
 	for( int i = 0;i < m_NodePoolSize - OldPoolSize;i += 1 )
 	{
-		NodePool[i + OldPoolSize] = (SCustomMapNode*) malloc(sizeof(SCustomMapNode));
+		NodePool[i + OldPoolSize] = static_cast<SCustomMapNode *>(malloc(sizeof(SCustomMapNode)));
 	}
 
 	m_NodePool = NodePool;