diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2008-12-09 11:11:03 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-14 18:04:24 +0100 |
| commit | 98cefca2ae887162d0b2eccc0d37e5dd30088481 (patch) | |
| tree | 81fd7c984222eb51bfb71d297428eb105e5c54b9 | |
| parent | 18f418c5cbd169be1b8e65c823e0b07d2d8db197 (diff) | |
| download | mana-98cefca2ae887162d0b2eccc0d37e5dd30088481.tar.gz mana-98cefca2ae887162d0b2eccc0d37e5dd30088481.tar.bz2 mana-98cefca2ae887162d0b2eccc0d37e5dd30088481.tar.xz mana-98cefca2ae887162d0b2eccc0d37e5dd30088481.zip | |
Make the window shortcuts configurable
(cherry picked from commit 4f2749ab2782fdece3c098b1a52b69cb37eea9eb)
| -rw-r--r-- | src/game.cpp | 18 | ||||
| -rw-r--r-- | src/keyboardconfig.cpp | 11 | ||||
| -rw-r--r-- | src/keyboardconfig.h | 9 |
3 files changed, 28 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp index 15c2d505..ee1efb66 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -519,15 +519,6 @@ void Game::handleInput() used = true; break; - case SDLK_F2: requestedWindow = statusWindow; break; - case SDLK_F3: requestedWindow = inventoryWindow; break; - case SDLK_F4: requestedWindow = equipmentWindow; break; - case SDLK_F5: requestedWindow = skillDialog; break; - case SDLK_F6: requestedWindow = minimap; break; - case SDLK_F7: requestedWindow = chatWindow; break; - case SDLK_F8: requestedWindow = itemShortcutWindow; break; - case SDLK_F9: requestedWindow = setupWindow; break; - case SDLK_F10: requestedWindow = debugWindow; break; //case SDLK_F11: requestedWindow = newSkillWindow; break; case SDLK_RETURN: @@ -661,6 +652,15 @@ void Game::handleInput() guildWindow->setVisible(false); } break; + case KeyboardConfig::KEY_WINDOW_STATUS: requestedWindow = statusWindow; break; + case KeyboardConfig::KEY_WINDOW_INVENTORY: requestedWindow = inventoryWindow; break; + case KeyboardConfig::KEY_WINDOW_EQUIPMENT: requestedWindow = equipmentWindow; break; + case KeyboardConfig::KEY_WINDOW_SKILL: requestedWindow = skillDialog; break; + case KeyboardConfig::KEY_WINDOW_MINIMAP: requestedWindow = minimap; break; + case KeyboardConfig::KEY_WINDOW_CHAT: requestedWindow = chatWindow; break; + case KeyboardConfig::KEY_WINDOW_SHORTCUT: requestedWindow = itemShortcutWindow; break; + case KeyboardConfig::KEY_WINDOW_SETUP: requestedWindow = setupWindow; break; + case KeyboardConfig::KEY_WINDOW_DEBUG: requestedWindow = debugWindow; break; } } diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 37d5f276..3e4e52c4 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -56,7 +56,16 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { {"keyShortcut6", SDLK_6, "Item Shortcut 6"}, {"keyShortcut7", SDLK_7, "Item Shortcut 7"}, {"keyShortcut8", SDLK_8, "Item Shortcut 8"}, - {"keyShortcut9", SDLK_9, "Item Shortcut 9"} + {"keyShortcut9", SDLK_9, "Item Shortcut 9"}, + {"keyWindowStatus", SDLK_F2, "Status Window"}, + {"keyWindowInventory", SDLK_F3, "Inventory Window"}, + {"keyWindowEquipment", SDLK_F4, "Equipment WIndow"}, + {"keyWindowSkill", SDLK_F5, "Skill Window"}, + {"keyWindowMinimap", SDLK_F6, "Minimap Window"}, + {"keyWindowChat", SDLK_F7, "Chat Window"}, + {"keyWindowShortcut", SDLK_F8, "Item Shortcut Window"}, + {"keyWindowSetup", SDLK_F9, "Setup Window"}, + {"keyWindowDebug", SDLK_F10, "Debug Window"} }; void KeyboardConfig::init() diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index d9886150..729bad5a 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -165,6 +165,15 @@ class KeyboardConfig KEY_SHORTCUT_7, KEY_SHORTCUT_8, KEY_SHORTCUT_9, + KEY_WINDOW_STATUS, + KEY_WINDOW_INVENTORY, + KEY_WINDOW_EQUIPMENT, + KEY_WINDOW_SKILL, + KEY_WINDOW_MINIMAP, + KEY_WINDOW_CHAT, + KEY_WINDOW_SHORTCUT, + KEY_WINDOW_SETUP, + KEY_WINDOW_DEBUG, KEY_TOTAL }; |