1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00

* CHexField renamed to CBattleHex

* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
This commit is contained in:
beegee1
2011-12-17 18:59:59 +00:00
parent 6ea88593db
commit 2f5d6f2684
176 changed files with 3257 additions and 9059 deletions

View File

@ -18,6 +18,7 @@
#include "../lib/CHeroHandler.h"
#include "../lib/BattleState.h"
#include "../lib/GameConstants.h"
#include "UIFramework/CGuiHandler.h"
/*
* CSpellWindow.cpp, part of VCMI engine
@ -550,12 +551,12 @@ void CSpellWindow::keyPressed(const SDL_KeyboardEvent & key)
if(LOCPLINT->altPressed())
{
SDLKey hlpKey = key.keysym.sym;
if(isNumKey(hlpKey, false))
if(CGuiHandler::isNumKey(hlpKey, false))
{
if(hlpKey == SDLK_KP_PLUS)
hlpKey = SDLK_EQUALS;
else
hlpKey = numToDigit(hlpKey);
hlpKey = CGuiHandler::numToDigit(hlpKey);
}
static const SDLKey spellSelectors[] = {SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5, SDLK_6, SDLK_7, SDLK_8, SDLK_9, SDLK_0, SDLK_MINUS, SDLK_EQUALS};