aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ClientSideMerchant.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/ClientSideMerchant.cpp')
-rw-r--r--Minecraft.World/ClientSideMerchant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/ClientSideMerchant.cpp b/Minecraft.World/ClientSideMerchant.cpp
index ba179300..1b54580b 100644
--- a/Minecraft.World/ClientSideMerchant.cpp
+++ b/Minecraft.World/ClientSideMerchant.cpp
@@ -7,8 +7,8 @@ ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, const wstring
{
this->source = source;
// 4J Stu - Need to do this after creating as a shared_ptr
- container = NULL; //new MerchantContainer(source, this);
- currentOffers = NULL;
+ container = nullptr; //new MerchantContainer(source, this);
+ currentOffers = nullptr;
m_name = name;
}