summaryrefslogtreecommitdiff
path: root/src/flooritemmanager.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-09-25 00:15:44 +0000
committerIra Rice <irarice@gmail.com>2008-09-25 00:15:44 +0000
commit489a429bea6739dfa25503b9329bd9e33bffb856 (patch)
tree8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/flooritemmanager.cpp
parent2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff)
downloadmana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz
mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2
mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz
mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.zip
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/flooritemmanager.cpp')
-rw-r--r--src/flooritemmanager.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp
index f6ad3442..fe64779b 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.cpp
@@ -21,8 +21,6 @@
* $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
*/
-#include <algorithm>
-
#include "flooritemmanager.h"
#include "floor_item.h"
@@ -50,7 +48,7 @@ void FloorItemManager::destroy(FloorItem *item)
void FloorItemManager::clear()
{
- for_each(mFloorItems.begin(), mFloorItems.end(), make_dtor(mFloorItems));
+ delete_all(mFloorItems);
mFloorItems.clear();
}