summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2009-05-08 02:13:17 -0400
committerChuck Miller <shadowmil@gmail.com>2009-05-08 02:13:17 -0400
commita16629925147248c01ee7d967c38fdeb65d55def (patch)
treeba16162ba185db0845fa60839d91590501c94a12 /src/game.cpp
parentf1c460190f7d2c0e2b9fd70ac21ba11a11fc8464 (diff)
parent31d98e81edc15a8192520ad68d9b851575f19c3a (diff)
downloadmana-client-a16629925147248c01ee7d967c38fdeb65d55def.tar.gz
mana-client-a16629925147248c01ee7d967c38fdeb65d55def.tar.bz2
mana-client-a16629925147248c01ee7d967c38fdeb65d55def.tar.xz
mana-client-a16629925147248c01ee7d967c38fdeb65d55def.zip
Merge branch 'master' of git://gitorious.org/tmw/mainline
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp3
1 files changed, 3 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;