From d10a68613b99bf3675b27b331a1e8439a820723c Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Fri, 23 Mar 2012 19:19:53 -0300 Subject: [PATCH] bind zoom hotkeys --- TODO | 5 +---- modules/core_lib/const.lua | 2 +- modules/game/gameinterface.lua | 2 ++ modules/game_console/console.lua | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 7984d7c0..5ef2a7a4 100644 --- a/TODO +++ b/TODO @@ -2,10 +2,9 @@ High priority TODO in order (before first public disclose) multiline text edit -remove UIGame move windows, navigate in containers complete miniwindow (close, minimize, resize, move) -create and bind all game functions/events +create and bind all game events player status icons (poison, etc) load modules from zip files display exit box when exiting from game @@ -68,9 +67,7 @@ remake spr/dat using OTML and image files game/graphics window with options do lua game event calls from Game instead from GameProtocol -auto walk minimap window - login queue questlog edit texts diff --git a/modules/core_lib/const.lua b/modules/core_lib/const.lua index 18ce7d13..f23cd349 100644 --- a/modules/core_lib/const.lua +++ b/modules/core_lib/const.lua @@ -203,7 +203,7 @@ KeyCodeDescs = { [KeyLeftParen] = '(', [KeyRightParen] = ')', [KeyAsterisk] = '*', - [KeyPlus] = '+', + [KeyPlus] = 'Plus', [KeyComma] = ',', [KeyMinus] = '-', [KeyPeriod] = '.', diff --git a/modules/game/gameinterface.lua b/modules/game/gameinterface.lua index 048bd496..3e2d7e62 100644 --- a/modules/game/gameinterface.lua +++ b/modules/game/gameinterface.lua @@ -45,6 +45,8 @@ function GameInterface.init() 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('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:zoomOut() end, gameRootPanel, 250) if g_game.isOnline() then GameInterface.show() diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua index 6d716c59..3699a574 100644 --- a/modules/game_console/console.lua +++ b/modules/game_console/console.lua @@ -327,7 +327,6 @@ function Console.addTabText(text, speaktype, tab) label:setText(text) label:setColor(speaktype.color) consoleTabBar:blinkTab(tab) - print 'yeah' if panel:getChildCount() > 10 then panel:removeChild(panel:getFirstChild())