summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-03-09 15:36:51 +0300
committerAndrei Karas <akaras@inbox.ru>2012-03-09 15:36:51 +0300
commit443813146a327504a07a507f43117d92296ca8a7 (patch)
tree073f9dcbc4b776675e299f5c5c9df1555cf73ee6 /src/game.cpp
parente11249023c8945fb817469b3b4362dcd8c2fd9f0 (diff)
downloadManaVerse-443813146a327504a07a507f43117d92296ca8a7.tar.gz
ManaVerse-443813146a327504a07a507f43117d92296ca8a7.tar.bz2
ManaVerse-443813146a327504a07a507f43117d92296ca8a7.tar.xz
ManaVerse-443813146a327504a07a507f43117d92296ca8a7.zip
Move getting keys from game to keyboard config.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 39d38ac5c..4e914c9a7 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -738,7 +738,7 @@ bool Game::handleOutfitsKeys(SDL_Event &event, bool &used)
if (wearOutfit || copyOutfit)
{
int outfitNum = outfitWindow->keyToNumber(
- event.key.keysym.sym);
+ keyboard.getKeyFromEvent(event));
if (outfitNum >= 0)
{
used = true;
@@ -760,7 +760,7 @@ bool Game::handleOutfitsKeys(SDL_Event &event, bool &used)
else if (keyboard.isActionActive(keyboard.KEY_MOVE_TO_POINT))
{
int num = outfitWindow->keyToNumber(
- event.key.keysym.sym);
+ keyboard.getKeyFromEvent(event));
if (socialWindow && num >= 0)
{
socialWindow->selectPortal(num);
@@ -846,7 +846,7 @@ bool Game::handleSwitchKeys(SDL_Event &event, bool &used)
}
}
- const int tKey = keyboard.getKeyIndex(event.key.keysym.sym);
+ const int tKey = keyboard.getKeyIndex(event);
switch (tKey)
{
case KeyboardConfig::KEY_SCROLL_CHAT_UP:
@@ -1316,7 +1316,7 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
{
// Moving player around
if (player_node->isAlive() && (!Being::isTalking()
- || keyboard.getKeyIndex(event.key.keysym.sym)
+ || keyboard.getKeyIndex(event)
== KeyboardConfig::KEY_TALK)
&& chatWindow && !chatWindow->isInputFocused()
&& !InventoryWindow::isAnyInputFocused() && !quitDialog)
@@ -1528,9 +1528,8 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
}
// Talk to the nearest NPC if 't' pressed
- if (wasDown && keyboard.getKeyIndex(event.key.keysym.sym)
- == KeyboardConfig::KEY_TALK &&
- !keyboard.isActionActive(keyboard.KEY_EMOTE))
+ if (wasDown && keyboard.getKeyIndex(event) == KeyboardConfig::KEY_TALK
+ && !keyboard.isActionActive(keyboard.KEY_EMOTE))
{
Being *target = player_node->getTarget();
@@ -1651,10 +1650,12 @@ void Game::handleInput()
{
wasDown = true;
+ logger->log("key. sym=%d, scancode=%d", event.key.keysym.sym, event.key.keysym.scancode);
+
if (setupWindow && setupWindow->isVisible() &&
keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
{
- keyboard.setNewKey(static_cast<int>(event.key.keysym.sym));
+ keyboard.setNewKey(event);
keyboard.callbackNewKey();
keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE);
return;
@@ -1693,7 +1694,7 @@ void Game::handleInput()
if (keyboard.isActionActive(keyboard.KEY_EMOTE))
{
// Emotions
- int emotion = keyboard.getKeyEmoteOffset(event.key.keysym.sym);
+ int emotion = keyboard.getKeyEmoteOffset(event);
if (emotion)
{
if (emoteShortcut)
@@ -1861,7 +1862,7 @@ void Game::updateHistory(SDL_Event &event)
if (event.key.keysym.sym != -1)
{
- int key = keyboard.getKeyIndex(event.key.keysym.sym);
+ int key = keyboard.getKeyIndex(event);
int time = cur_time;
int idx = -1;
for (int f = 0; f < MAX_LASTKEYS; f ++)