summaryrefslogtreecommitdiffstats
path: root/source/cPlayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/cPlayer.cpp')
-rw-r--r--source/cPlayer.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index 495cc6abf..7899fdc97 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -125,18 +125,14 @@ void cPlayer::Initialize( cWorld* a_World )
cPlayer::~cPlayer(void)
{
SaveToDisk();
- m_ClientHandle = 0;
+ m_ClientHandle = NULL;
CloseWindow(-1);
- if( m_Inventory )
- {
- delete m_Inventory;
- m_Inventory = 0;
- }
- if(m_CreativeInventory)
- {
- delete m_CreativeInventory;
- }
+ delete m_Inventory;
+ m_Inventory = NULL;
+
+ delete m_CreativeInventory;
+
delete m_pState;
m_World->RemovePlayer( this );
}