summaryrefslogtreecommitdiff
path: root/src/resources/monsterdb.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-14 18:03:19 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-14 18:03:19 +0100
commit18f418c5cbd169be1b8e65c823e0b07d2d8db197 (patch)
treead98ff929cf43690acb80f69e317fb5dcb8ff4f3 /src/resources/monsterdb.cpp
parent69d62451a7a582e3906a7c9328ae14e4bba5ccfa (diff)
downloadmana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.tar.gz
mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.tar.bz2
mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.tar.xz
mana-18f418c5cbd169be1b8e65c823e0b07d2d8db197.zip
Code reformatting
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-) (cherry picked from eAthena branch, commit 68760426532b9ca4c6939d7a7b8faa1586ee82e0) Conflicts: src/being.cpp src/being.h src/gui/tabbedcontainer.cpp src/particle.cpp src/particle.h
Diffstat (limited to 'src/resources/monsterdb.cpp')
-rw-r--r--src/resources/monsterdb.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index e0c47db8..ed4acd38 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -19,8 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <algorithm>
-
#include "monsterdb.h"
#include "resourcemanager.h"
@@ -147,19 +145,16 @@ MonsterDB::load()
mLoaded = true;
}
-void
-MonsterDB::unload()
+void MonsterDB::unload()
{
- for_each(mMonsterInfos.begin(), mMonsterInfos.end(),
- make_dtor(mMonsterInfos));
+ delete_all(mMonsterInfos);
mMonsterInfos.clear();
mLoaded = false;
}
-const MonsterInfo&
-MonsterDB::get(int id)
+const MonsterInfo &MonsterDB::get(int id)
{
MonsterInfoIterator i = mMonsterInfos.find(id);