diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-10-27 09:03:13 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-10-27 09:03:13 +0000 |
| commit | ee15a808a1e0d36167f80d9f96147103ba5583de (patch) | |
| tree | 0756c69cfb8c8d09b0abc29aa302aeea81a59af5 /src/resources | |
| parent | 4d546730d97828bfed5586c1d50527c7ff5e5c79 (diff) | |
| download | mana-client-ee15a808a1e0d36167f80d9f96147103ba5583de.tar.gz mana-client-ee15a808a1e0d36167f80d9f96147103ba5583de.tar.bz2 mana-client-ee15a808a1e0d36167f80d9f96147103ba5583de.tar.xz mana-client-ee15a808a1e0d36167f80d9f96147103ba5583de.zip | |
Made it compile with GCC 4.3
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/buddylist.cpp | 8 | ||||
| -rw-r--r-- | src/resources/imageset.cpp | 2 | ||||
| -rw-r--r-- | src/resources/itemdb.cpp | 4 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 2 | ||||
| -rw-r--r-- | src/resources/monsterdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/monsterinfo.cpp | 2 | ||||
| -rw-r--r-- | src/resources/monsterinfo.h | 2 |
7 files changed, 16 insertions, 6 deletions
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index 9327ef60..2f85825a 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -21,11 +21,15 @@ * $Id$ */ +#include <algorithm> +#include <cstring> +#include <iostream> +#include <fstream> + #include "buddylist.h" + #include "../main.h" #include "../configuration.h" -#include <iostream> -#include <fstream> BuddyList::BuddyList() { diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index 565e8860..08a6a110 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -21,6 +21,8 @@ * $Id$ */ +#include <algorithm> + #include "imageset.h" #include "../log.h" diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 49632279..a83da342 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -21,12 +21,12 @@ * $Id$ */ +#include <algorithm> #include <cassert> +#include <libxml/tree.h> #include "itemdb.h" -#include <libxml/tree.h> - #include "iteminfo.h" #include "resourcemanager.h" diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index b6fc922c..2726a012 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -107,7 +107,7 @@ class ItemInfo void setWeaponType(int); - const SpriteAction getAttackType() const + SpriteAction getAttackType() const { return mAttackType; } void addSound(EquipmentSoundEvent event, const std::string &filename); diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 7bdafdc2..84e3a219 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -21,6 +21,8 @@ * $Id$ */ +#include <algorithm> + #include "monsterdb.h" #include "resourcemanager.h" diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 2e896237..0a7e18dc 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -21,6 +21,8 @@ * $Id$ */ +#include <algorithm> + #include "monsterinfo.h" #include "../utils/dtor.h" diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index b068056d..3034f10e 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -77,7 +77,7 @@ class MonsterInfo const std::string& getSprite() const { return mSprite; } - const Being::TargetCursorSize + Being::TargetCursorSize getTargetCursorSize() const { return mTargetCursorSize; } std::string |