diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2009-05-08 02:13:17 -0400 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2009-05-08 02:13:17 -0400 |
| commit | a16629925147248c01ee7d967c38fdeb65d55def (patch) | |
| tree | ba16162ba185db0845fa60839d91590501c94a12 /src | |
| parent | f1c460190f7d2c0e2b9fd70ac21ba11a11fc8464 (diff) | |
| parent | 31d98e81edc15a8192520ad68d9b851575f19c3a (diff) | |
| download | mana-a16629925147248c01ee7d967c38fdeb65d55def.tar.gz mana-a16629925147248c01ee7d967c38fdeb65d55def.tar.bz2 mana-a16629925147248c01ee7d967c38fdeb65d55def.tar.xz mana-a16629925147248c01ee7d967c38fdeb65d55def.zip | |
Merge branch 'master' of git://gitorious.org/tmw/mainline
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 3 | ||||
| -rw-r--r-- | src/keyboardconfig.cpp | 1 | ||||
| -rw-r--r-- | src/keyboardconfig.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp index bda71dbd..3cfe2e3c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -765,6 +765,9 @@ void Game::handleInput() case KeyboardConfig::KEY_WINDOW_DEBUG: requestedWindow = debugWindow; break; + case KeyboardConfig::KEY_WINDOW_PARTY: + requestedWindow = partyWindow; + break; case KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT: requestedWindow = emoteShortcutWindow; break; diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 1d8cd6e3..efb8f189 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -77,6 +77,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { {"keyWindowShortcut", SDLK_F8, _("Item Shortcut Window")}, {"keyWindowSetup", SDLK_F9, _("Setup Window")}, {"keyWindowDebug", SDLK_F10, _("Debug Window")}, + {"keyWindowParty", SDLK_F11, _("Party Window")}, {"keyWindowEmoteBar", SDLK_F12, _("Emote Shortcut Window")}, {"keyEmoteShortcut1", SDLK_1, strprintf(_("Emote Shortcut %d"), 1)}, {"keyEmoteShortcut2", SDLK_2, strprintf(_("Emote Shortcut %d"), 2)}, diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index ebb94c89..d461c827 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -188,6 +188,7 @@ class KeyboardConfig KEY_WINDOW_SHORTCUT, KEY_WINDOW_SETUP, KEY_WINDOW_DEBUG, + KEY_WINDOW_PARTY, KEY_WINDOW_EMOTE_SHORTCUT, KEY_EMOTE_1, KEY_EMOTE_2, |