summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-09 14:49:07 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-09 14:49:07 +0000
commitcd68076f45b1ae6332b5298f57240aa4b0ebf357 (patch)
tree1736ba4bf56cf5d9ac32a50a036b996954d651ee /src/main.cpp
parentaca696b5c784bfbb426c50ac58e93e3d61944b39 (diff)
downloadmana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.tar.gz
mana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.tar.bz2
mana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.tar.xz
mana-cd68076f45b1ae6332b5298f57240aa4b0ebf357.zip
Re-enabled non-functional item shortcut window, planned to be fixed for 0.0.25
(reverted change 3811). Somehow seems it's not drawing anything, not sure why.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 4e9936e9..9e75090c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -48,7 +48,7 @@
#include "keyboardconfig.h"
#include "game.h"
#include "graphics.h"
-//#include "itemshortcut.h"
+#include "itemshortcut.h"
#include "lockedarray.h"
#include "localplayer.h"
#include "log.h"
@@ -308,7 +308,7 @@ void init_engine(const Options &options)
graphics->_beginDraw();
// Initialize the item shortcuts.
- //itemShortcut = new ItemShortcut();
+ itemShortcut = new ItemShortcut();
gui = new Gui(graphics);
state = UPDATE_STATE; /**< Initial game state */
@@ -337,7 +337,7 @@ void init_engine(const Options &options)
void exit_engine()
{
// Before config.write() since it writes the shortcuts to the config
- //delete itemShortcut;
+ delete itemShortcut;
config.write();