mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-26 22:57:00 +02:00
Merge pull request #2334 from Laserlicht/patch-3
Battleintro: Skip with mouse button
This commit is contained in:
commit
f23de91fad
@ -86,7 +86,7 @@ BattleWindow::BattleWindow(BattleInterface & owner):
|
||||
else
|
||||
tacticPhaseEnded();
|
||||
|
||||
addUsedEvents(KEYBOARD);
|
||||
addUsedEvents(LCLICK | KEYBOARD);
|
||||
}
|
||||
|
||||
void BattleWindow::createQueue()
|
||||
@ -204,6 +204,16 @@ void BattleWindow::keyPressed(EShortcut key)
|
||||
InterfaceObjectConfigurable::keyPressed(key);
|
||||
}
|
||||
|
||||
void BattleWindow::clickPressed(const Point & cursorPosition)
|
||||
{
|
||||
if (owner.openingPlaying())
|
||||
{
|
||||
owner.openingEnd();
|
||||
return;
|
||||
}
|
||||
InterfaceObjectConfigurable::clickPressed(cursorPosition);
|
||||
}
|
||||
|
||||
void BattleWindow::tacticPhaseStarted()
|
||||
{
|
||||
auto menuBattle = widget<CIntObject>("menuBattle");
|
||||
|
@ -86,6 +86,7 @@ public:
|
||||
void deactivate() override;
|
||||
void keyPressed(EShortcut key) override;
|
||||
bool captureThisKey(EShortcut key) override;
|
||||
void clickPressed(const Point & cursorPosition) override;
|
||||
void show(Canvas & to) override;
|
||||
void showAll(Canvas & to) override;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user