fix some win32 hotkeys and change zoom hotkeys

This commit is contained in:
Eduardo Bart 2012-03-30 07:21:24 -03:00
parent 95e0a41b55
commit 595cdc1bb4
3 changed files with 6 additions and 2 deletions

View File

@ -49,7 +49,7 @@ function GameInterface.init()
Keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY) Keyboard.bindKeyPress('Ctrl+Numpad2', function() g_game.turn(South) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
Keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY) Keyboard.bindKeyPress('Ctrl+Numpad4', function() g_game.turn(West) end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
Keyboard.bindKeyPress('Escape', function() g_game.cancelAttackAndFollow() end, gameRootPanel, WALK_AUTO_REPEAT_DELAY) Keyboard.bindKeyPress('Escape', function() g_game.cancelAttackAndFollow() end, gameRootPanel, WALK_AUTO_REPEAT_DELAY)
Keyboard.bindKeyPress('Ctrl+Plus', function() gameMapPanel:zoomIn() end, gameRootPanel, 250) Keyboard.bindKeyPress('Ctrl+=', function() gameMapPanel:zoomIn() end, gameRootPanel, 250)
Keyboard.bindKeyPress('Ctrl+-', function() gameMapPanel:zoomOut() end, gameRootPanel, 250) Keyboard.bindKeyPress('Ctrl+-', function() gameMapPanel:zoomOut() end, gameRootPanel, 250)
if g_game.isOnline() then if g_game.isOnline() then

View File

@ -156,11 +156,13 @@ WIN32Window::WIN32Window()
*/ */
// keypad // keypad
/*
m_keyMap[VK_ADD] = Fw::KeyPlus; m_keyMap[VK_ADD] = Fw::KeyPlus;
m_keyMap[VK_SUBTRACT] = Fw::KeyMinus; m_keyMap[VK_SUBTRACT] = Fw::KeyMinus;
m_keyMap[VK_DECIMAL] = Fw::KeyPeriod; m_keyMap[VK_DECIMAL] = Fw::KeyPeriod;
m_keyMap[VK_DIVIDE] = Fw::KeySlash; m_keyMap[VK_DIVIDE] = Fw::KeySlash;
m_keyMap[VK_MULTIPLY] = Fw::KeyAsterisk; m_keyMap[VK_MULTIPLY] = Fw::KeyAsterisk;
*/
m_keyMap[VK_OEM_1] = Fw::KeySemicolon; m_keyMap[VK_OEM_1] = Fw::KeySemicolon;
m_keyMap[VK_OEM_2] = Fw::KeySlash; m_keyMap[VK_OEM_2] = Fw::KeySlash;
@ -170,7 +172,7 @@ WIN32Window::WIN32Window()
m_keyMap[VK_OEM_6] = Fw::KeyRightBracket; m_keyMap[VK_OEM_6] = Fw::KeyRightBracket;
m_keyMap[VK_OEM_7] = Fw::KeyApostrophe; m_keyMap[VK_OEM_7] = Fw::KeyApostrophe;
m_keyMap[VK_OEM_MINUS] = Fw::KeyMinus; m_keyMap[VK_OEM_MINUS] = Fw::KeyMinus;
m_keyMap[VK_OEM_PLUS] = Fw::KeyPlus; m_keyMap[VK_OEM_PLUS] = Fw::KeyEqual;
m_keyMap[VK_OEM_COMMA] = Fw::KeyComma; m_keyMap[VK_OEM_COMMA] = Fw::KeyComma;
m_keyMap[VK_OEM_PERIOD] = Fw::KeyPeriod; m_keyMap[VK_OEM_PERIOD] = Fw::KeyPeriod;

View File

@ -155,11 +155,13 @@ X11Window::X11Window()
m_keyMap[XK_asciitilde] = Fw::KeyTilde; m_keyMap[XK_asciitilde] = Fw::KeyTilde;
// keypad // keypad
/*
m_keyMap[XK_KP_Add] = Fw::KeyPlus; m_keyMap[XK_KP_Add] = Fw::KeyPlus;
m_keyMap[XK_KP_Subtract] = Fw::KeyMinus; m_keyMap[XK_KP_Subtract] = Fw::KeyMinus;
m_keyMap[XK_KP_Decimal] = Fw::KeyPeriod; m_keyMap[XK_KP_Decimal] = Fw::KeyPeriod;
m_keyMap[XK_KP_Divide] = Fw::KeySlash; m_keyMap[XK_KP_Divide] = Fw::KeySlash;
m_keyMap[XK_KP_Multiply] = Fw::KeyAsterisk; m_keyMap[XK_KP_Multiply] = Fw::KeyAsterisk;
*/
m_keyMap[XK_KP_Enter] = Fw::KeyEnter; m_keyMap[XK_KP_Enter] = Fw::KeyEnter;
// keypad with numlock off // keypad with numlock off