summaryrefslogtreecommitdiff
path: root/src/localplayer.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-18 20:36:37 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-18 20:36:37 +0100
commitfaa1a1d9d24008fee298ca688d76a684af96d0a2 (patch)
tree29a15514f3d96fc392ece03f10df8f68d0d7129f /src/localplayer.cpp
parent7e43b82e3b7cda034fab34c15ecfaa97c1a99146 (diff)
parent218303948fa3aa3fd139b47e303ed1f7c7cfd802 (diff)
downloadMana-faa1a1d9d24008fee298ca688d76a684af96d0a2.tar.gz
Mana-faa1a1d9d24008fee298ca688d76a684af96d0a2.tar.bz2
Mana-faa1a1d9d24008fee298ca688d76a684af96d0a2.tar.xz
Mana-faa1a1d9d24008fee298ca688d76a684af96d0a2.zip
Merge commit 'aethyra/master'
Conflicts: src/net/npchandler.cpp
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r--src/localplayer.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 44899069..b9654e63 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -92,7 +92,6 @@ LocalPlayer::~LocalPlayer()
{
delete mInventory;
delete mStorage;
- delete mName;
for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
{