diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-12-24 12:48:40 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-12-24 12:48:40 +0000 |
| commit | ad916910b34d91db78c5eb6dc966745117bd0d6f (patch) | |
| tree | 7cbc1f41d49a5715b723c325fdbf6f3aa7e5ebd9 /src/game.cpp | |
| parent | 657f2b37b3b0b349cc7094541c6ade7d3d8e329d (diff) | |
| download | mana-ad916910b34d91db78c5eb6dc966745117bd0d6f.tar.gz mana-ad916910b34d91db78c5eb6dc966745117bd0d6f.tar.bz2 mana-ad916910b34d91db78c5eb6dc966745117bd0d6f.tar.xz mana-ad916910b34d91db78c5eb6dc966745117bd0d6f.zip | |
Disabled non-functional item shortcut window.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp index df355e66..de8a3ea2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -36,7 +36,7 @@ #include "engine.h" #include "flooritemmanager.h" #include "graphics.h" -#include "itemshortcut.h" +//#include "itemshortcut.h" #include "joystick.h" #include "keyboardconfig.h" #include "localplayer.h" @@ -54,7 +54,7 @@ #include "gui/gui.h" #include "gui/help.h" #include "gui/inventorywindow.h" -#include "gui/itemshortcutwindow.h" +//#include "gui/itemshortcutwindow.h" #include "gui/menuwindow.h" #include "gui/minimap.h" #include "gui/ministatus.h" @@ -118,7 +118,7 @@ TradeWindow *tradeWindow; //BuddyWindow *buddyWindow; HelpWindow *helpWindow; DebugWindow *debugWindow; -ItemShortcutWindow *itemShortcutWindow; +//ItemShortcutWindow *itemShortcutWindow; BeingManager *beingManager = NULL; FloorItemManager *floorItemManager = NULL; @@ -198,7 +198,7 @@ void createGuiWindows(Network *network) //buddyWindow = new BuddyWindow(); helpWindow = new HelpWindow(); debugWindow = new DebugWindow(); - itemShortcutWindow = new ItemShortcutWindow(); + //itemShortcutWindow = new ItemShortcutWindow(); // Initialize window positions //chargeDialog->setPosition( @@ -211,7 +211,7 @@ void createGuiWindows(Network *network) chatWindow->setVisible(true); miniStatusWindow->setVisible(true); menuWindow->setVisible(true); - itemShortcutWindow->setVisible(true); + //itemShortcutWindow->setVisible(true); if (config.getValue("logToChat", 0)) { @@ -244,7 +244,7 @@ void destroyGuiWindows() //delete buddyWindow; delete helpWindow; delete debugWindow; - delete itemShortcutWindow; + //delete itemShortcutWindow; } Game::Game(Network *network): @@ -535,6 +535,7 @@ void Game::handleInput() { const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); // Checks if any item shortcut is pressed. + /* for (int i = KeyboardConfig::KEY_SHORTCUT_0; i <= KeyboardConfig::KEY_SHORTCUT_9; i++) @@ -545,6 +546,7 @@ void Game::handleInput() break; } } + */ switch (tKey) { case KeyboardConfig::KEY_PICKUP: { |