summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-12 14:19:47 -0700
committerJared <jaxad0127@gmail.com>2010-01-12 14:41:34 -0700
commit1420656e08f65f3e5c963f82b10a718b8026d216 (patch)
tree262441cb8f9587b982f9078398844021c0d22de0 /src/resources/resourcemanager.cpp
parentd18b9fb1aa086d3ed0187d61940564f197411cf4 (diff)
downloadMana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.gz
Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.bz2
Mana-1420656e08f65f3e5c963f82b10a718b8026d216.tar.xz
Mana-1420656e08f65f3e5c963f82b10a718b8026d216.zip
Standardize header order
Also remove some extra new lines and fix eAthena's PartyTab define guards.
Diffstat (limited to 'src/resources/resourcemanager.cpp')
-rw-r--r--src/resources/resourcemanager.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index fe594a3f..eee76d55 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -21,6 +21,8 @@
#include "resources/resourcemanager.h"
+#include "log.h"
+
#include "resources/dye.h"
#include "resources/image.h"
#include "resources/imageset.h"
@@ -28,11 +30,11 @@
#include "resources/soundeffect.h"
#include "resources/spritedef.h"
-#include "log.h"
-
-#include <cassert>
#include <physfs.h>
+
#include <SDL_image.h>
+
+#include <cassert>
#include <sstream>
#include <sys/time.h>