diff options
author | Ira Rice <irarice@gmail.com> | 2009-01-08 16:38:22 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-01-08 16:38:22 -0700 |
commit | a001775f8b0b992cc7c4c5863722d02e8606b175 (patch) | |
tree | 44dfa8ab01119022b7999b27c3031a39d9d3c186 /src/main.cpp | |
parent | 193ccbdba8031a351ea622f8842b6d9a0b6cfd43 (diff) | |
parent | 611210b1e0fd9cbaed38b229462e109d8f4be385 (diff) | |
download | mana-a001775f8b0b992cc7c4c5863722d02e8606b175.tar.gz mana-a001775f8b0b992cc7c4c5863722d02e8606b175.tar.bz2 mana-a001775f8b0b992cc7c4c5863722d02e8606b175.tar.xz mana-a001775f8b0b992cc7c4c5863722d02e8606b175.zip |
Fixed include order (pedantic change)
Conflicts:
src/gui/smileycontainer.cpp
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index c15011ff..efb14deb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,6 +40,7 @@ #include "game.h" #include "graphics.h" #include "itemshortcut.h" +#include "smileyshortcut.h" #include "keyboardconfig.h" #include "localplayer.h" #include "lockedarray.h" @@ -401,6 +402,9 @@ void init_engine(const Options &options) // Initialize the item shortcuts. itemShortcut = new ItemShortcut(); + + // Initialize the smiley shortcuts. + smileyShortcut = new SmileyShortcut(); gui = new Gui(graphics); state = LOGIN_STATE; /**< Initial game state */ @@ -433,6 +437,8 @@ void exit_engine() { // Before config.write() since it writes the shortcuts to the config delete itemShortcut; + + delete smileyShortcut; config.write(); |