diff options
| -rw-r--r-- | src/game.cpp | 38 | ||||
| -rw-r--r-- | src/gui/minimap.cpp | 12 | ||||
| -rw-r--r-- | src/keyboardconfig.cpp | 11 | ||||
| -rw-r--r-- | src/keyboardconfig.h | 9 |
4 files changed, 52 insertions, 18 deletions
diff --git a/src/game.cpp b/src/game.cpp index 85799588..91a58d43 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -594,16 +594,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_RETURN: // Input chat window if (chatWindow->isInputFocused() || @@ -704,7 +694,6 @@ void Game::handleInput() if (item) player_node->pickUp(item); - used = true; } break; @@ -726,6 +715,33 @@ void Game::handleInput() debugWindow->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/gui/minimap.cpp b/src/gui/minimap.cpp index 6fbcd5da..fc00ad18 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -52,14 +52,14 @@ void Minimap::setMapImage(Image *img) if (mMapImage) { - int offsetX = getPadding(); - int offsetY = getTitleBarHeight(); + int offsetX = getPadding() + 4; + int offsetY = getTitleBarHeight() + 4; mMapImage->setAlpha(0.7); setDefaultSize(offsetX, offsetY, - mMapImage->getWidth() < (100 + offsetX) ? - mMapImage->getWidth() + offsetX : (100 + offsetX), - mMapImage->getHeight() < (100 + offsetY) ? - mMapImage->getHeight() + offsetY : (100 + offsetY)); + mMapImage->getWidth() < 100 ? + mMapImage->getWidth() + offsetX : 100, + mMapImage->getHeight() < 100 ? + mMapImage->getHeight() + offsetY : 100); loadWindowState(); } else diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index f67c9534..ea40ff38 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -59,7 +59,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 158252d4..b51f12f4 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -168,6 +168,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 }; |