Merge branch 'master' into Bow

2014-06-26 15:49:53 +02:00
parent ce06ec1632 af3779ab9a
commit eaf36766f6
82 changed files with 5336 additions and 3499 deletions
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -146,6 +146,7 @@ cPlayer::~cPlayer(void)
 	m_ClientHandle = NULL;
 	
 	delete m_InventoryWindow;
+	m_InventoryWindow = NULL;
 	
 	LOGD("Player %p deleted", this);
 }