summaryrefslogtreecommitdiff
path: root/src/resources/emotedb.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:42:53 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:43:55 +0100
commit1715d0afe44a282a356ca88e47c92ec556f094dd (patch)
tree36dcaa69dcf0165c33d7da1c1cc1a9f5fb7e228f /src/resources/emotedb.cpp
parent511d9ac780e094767e806c9a448ac973279dd4c8 (diff)
downloadmana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.gz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.bz2
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.xz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.zip
Fixed include structure in resource/ directory
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
Diffstat (limited to 'src/resources/emotedb.cpp')
-rw-r--r--src/resources/emotedb.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 5bc8407a..3ee40f0e 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -19,12 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "emotedb.h"
+#include "resources/emotedb.h"
-#include "../animatedsprite.h"
-#include "../log.h"
+#include "animatedsprite.h"
+#include "log.h"
-#include "../utils/xml.h"
+#include "utils/xml.h"
namespace
{
@@ -138,13 +138,13 @@ const EmoteInfo *EmoteDB::get(int id)
}
}
-const AnimatedSprite* EmoteDB::getAnimation(int id)
+const AnimatedSprite *EmoteDB::getAnimation(int id)
{
const EmoteInfo *info = get(id);
return info->sprites.front()->sprite;
}
-const int& EmoteDB::getLast()
+const int &EmoteDB::getLast()
{
return mLastEmote;
}