games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #2334 from Laserlicht/patch-3

Browse Source 
Battleintro: Skip with mouse button
This commit is contained in:
Ivan Savenko
2023-07-17 15:40:24 +03:00
committed by GitHub
parent be057f0d67 4e242f98fd
commit f23de91fad
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/battle/BattleWindow.cpp
View File

@@ -86,7 +86,7 @@ BattleWindow::BattleWindow(BattleInterface & owner):
else else
tacticPhaseEnded(); tacticPhaseEnded();
addUsedEvents(KEYBOARD); addUsedEvents(LCLICK | KEYBOARD);
} }
void BattleWindow::createQueue() void BattleWindow::createQueue()
@@ -204,6 +204,16 @@ void BattleWindow::keyPressed(EShortcut key)
InterfaceObjectConfigurable::keyPressed(key); InterfaceObjectConfigurable::keyPressed(key);
} }
void BattleWindow::clickPressed(const Point & cursorPosition)
{
if (owner.openingPlaying())
{
owner.openingEnd();
return;
}
InterfaceObjectConfigurable::clickPressed(cursorPosition);
}
void BattleWindow::tacticPhaseStarted() void BattleWindow::tacticPhaseStarted()
{ {
auto menuBattle = widget<CIntObject>("menuBattle"); auto menuBattle = widget<CIntObject>("menuBattle");

1
client/battle/BattleWindow.h
View File

@@ -86,6 +86,7 @@ public:
void deactivate() override; void deactivate() override;
void keyPressed(EShortcut key) override; void keyPressed(EShortcut key) override;
bool captureThisKey(EShortcut key) override; bool captureThisKey(EShortcut key) override;
void clickPressed(const Point & cursorPosition) override;
void show(Canvas & to) override; void show(Canvas & to) override;
void showAll(Canvas & to) override; void showAll(Canvas & to) override;