diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-07-31 22:32:29 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-07-31 22:33:09 +0200 |
| commit | 40e15ec4676cf74713685c74f8feeeab6213ade7 (patch) | |
| tree | 80019948d1c67fff81c1e564b07b9a954b46db80 | |
| parent | 6b607a737019ff1fb4c5106ff4baed30c3de45f6 (diff) | |
| download | mana-40e15ec4676cf74713685c74f8feeeab6213ade7.tar.gz mana-40e15ec4676cf74713685c74f8feeeab6213ade7.tar.bz2 mana-40e15ec4676cf74713685c74f8feeeab6213ade7.tar.xz mana-40e15ec4676cf74713685c74f8feeeab6213ade7.zip | |
Removed the emote shortcut window
We have no emotes for now, and we will never trigger them from such an
ugly shortcut window anyway.
| -rw-r--r-- | src/game.cpp | 7 | ||||
| -rw-r--r-- | src/keyboardconfig.cpp | 1 | ||||
| -rw-r--r-- | src/keyboardconfig.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp index 222e56df..aa4be543 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -107,7 +107,6 @@ TradeWindow *tradeWindow; HelpWindow *helpWindow; DebugWindow *debugWindow; ShortcutWindow *itemShortcutWindow; -ShortcutWindow *emoteShortcutWindow; OutfitWindow *outfitWindow; SpecialsWindow *specialsWindow; SocialWindow *socialWindow; @@ -161,8 +160,6 @@ static void createGuiWindows() debugWindow = new DebugWindow; itemShortcutWindow = new ShortcutWindow("ItemShortcut", new ItemShortcutContainer); - emoteShortcutWindow = new ShortcutWindow("EmoteShortcut", - new EmoteShortcutContainer); outfitWindow = new OutfitWindow(); specialsWindow = new SpecialsWindow(); socialWindow = new SocialWindow(); @@ -195,7 +192,6 @@ static void destroyGuiWindows() del_0(helpWindow) del_0(debugWindow) del_0(itemShortcutWindow) - del_0(emoteShortcutWindow) del_0(outfitWindow) del_0(specialsWindow) del_0(socialWindow) @@ -685,9 +681,6 @@ void Game::handleInput() case KeyboardConfig::KEY_WINDOW_SOCIAL: requestedWindow = socialWindow; break; - case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT: - requestedWindow = emoteShortcutWindow; - break; case KeyboardConfig::KEY_WINDOW_OUTFIT: requestedWindow = outfitWindow; break; diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 30f27e9f..cad41bd6 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -78,7 +78,6 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { {"keyWindowSetup", SDLK_F9, _("Setup Window")}, {"keyWindowDebug", SDLK_F10, _("Debug Window")}, {"keyWindowSocial", SDLK_F11, _("Social Window")}, - {"keyWindowEmoteBar", SDLK_F12, _("Emote Shortcut Window")}, {"keyWindowOutfit", SDLK_o, _("Outfits Window")}, {"keyWearOutfit", SDLK_RCTRL, _("Wear Outfit")}, {"keyCopyOutfit", SDLK_RALT, _("Copy Outfit")}, diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index 34aad4c4..6f40e03d 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -193,7 +193,6 @@ class KeyboardConfig KEY_WINDOW_SETUP, KEY_WINDOW_DEBUG, KEY_WINDOW_SOCIAL, - KEY_WINDOW_EMOTE_SHORTCUT, KEY_WINDOW_OUTFIT, KEY_WEAR_OUTFIT, KEY_COPY_OUTFIT, |