diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2012-08-05 21:49:35 +0200 |
|---|---|---|
| committer | Stefan Beller <stefanbeller@googlemail.com> | 2012-08-05 21:49:35 +0200 |
| commit | ad8cae4095a1efe19f9b8ea87a49fd78ab76fc24 (patch) | |
| tree | 1988a3eea167bd7123b625be84de5ddca262e178 /src/game-server | |
| parent | 1a3839c8edf0a49adbd34299eb2eab585f093f7f (diff) | |
| download | manaserv-ad8cae4095a1efe19f9b8ea87a49fd78ab76fc24.tar.gz manaserv-ad8cae4095a1efe19f9b8ea87a49fd78ab76fc24.tar.bz2 manaserv-ad8cae4095a1efe19f9b8ea87a49fd78ab76fc24.tar.xz manaserv-ad8cae4095a1efe19f9b8ea87a49fd78ab76fc24.zip | |
Fixup segfault at shutdown of gameserver.
The objects of ItemEffectInfo class, which are hold in mDispells
are definitly in mEffects as well, because they are added in
in addEffect as the same pointer.
Reviewed-by: Erik Schilling
Diffstat (limited to 'src/game-server')
| -rw-r--r-- | src/game-server/item.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/game-server/item.h b/src/game-server/item.h index 1441e4bb..b93352e7 100644 --- a/src/game-server/item.h +++ b/src/game-server/item.h @@ -269,11 +269,7 @@ class ItemClass delete mEffects.begin()->second; mEffects.erase(mEffects.begin()); } - while (mDispells.begin() != mDispells.end()) - { - delete mDispells.begin()->second; - mDispells.erase(mDispells.begin()); - } + mDispells.clear(); } unsigned short mDatabaseID; /**< Item reference information */ |