summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-01-12 17:40:21 -0700
committerIra Rice <irarice@gmail.com>2009-01-12 17:40:21 -0700
commiteda625ec28a2349692c749aa7802144407820d0b (patch)
treeae8cd7f94e44c4a4e1381d24ff4673ed602ccc75
parent50db322f400b80192d28a7104e4d3ae59e9caa16 (diff)
downloadmana-eda625ec28a2349692c749aa7802144407820d0b.tar.gz
mana-eda625ec28a2349692c749aa7802144407820d0b.tar.bz2
mana-eda625ec28a2349692c749aa7802144407820d0b.tar.xz
mana-eda625ec28a2349692c749aa7802144407820d0b.zip
Fixed a path error that slipped through by accident.
Signed-off-by: Ira Rice <irarice@gmail.com>
-rw-r--r--src/game.cpp2
-rw-r--r--src/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 753d7afa..a9e59586 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -31,6 +31,7 @@
#include "beingmanager.h"
#include "effectmanager.h"
+#include "emoteshortcut.h"
#include "engine.h"
#include "flooritemmanager.h"
#include "graphics.h"
@@ -48,7 +49,6 @@
#include "gui/chat.h"
#include "gui/confirm_dialog.h"
#include "gui/debugwindow.h"
-#include "gui/emoteshortcut.h"
#include "gui/emoteshortcutcontainer.h"
#include "gui/emotewindow.h"
#include "gui/equipmentwindow.h"
diff --git a/src/main.cpp b/src/main.cpp
index 3cf8611d..61b90b12 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,6 +37,7 @@
#include <SDL/SDL_ttf.h>
#include "configuration.h"
+#include "emoteshortcut.h"
#include "game.h"
#include "graphics.h"
#include "itemshortcut.h"
@@ -56,7 +57,6 @@
#include "gui/char_server.h"
#include "gui/char_select.h"
#include "gui/colour.h"
-#include "gui/emoteshortcut.h"
#include "gui/gui.h"
#include "gui/login.h"
#include "gui/ok_dialog.h"