games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Reduced usage of topWindow() method

Browse Source
This commit is contained in:
Ivan Savenko
2023-05-16 18:34:23 +03:00
parent e2ef136003
commit ad3e54e6c0
30 changed files with 171 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/battle/BattleActionsController.cpp
View File

@@ -773,7 +773,7 @@ void BattleActionsController::onHexHovered(BattleHex hoveredHex)
if (owner.openingPlaying())
{
currentConsoleMsg = VLC->generaltexth->translate("vcmi.battleWindow.pressKeyToSkipIntro");
GH.statusbar->write(currentConsoleMsg);
GH.statusbar()->write(currentConsoleMsg);
return;
}
@@ -783,7 +783,7 @@ void BattleActionsController::onHexHovered(BattleHex hoveredHex)
if (hoveredHex == BattleHex::INVALID)
{
if (!currentConsoleMsg.empty())
GH.statusbar->clearIfMatching(currentConsoleMsg);
GH.statusbar()->clearIfMatching(currentConsoleMsg);
currentConsoleMsg.clear();
CCS->curh->set(Cursor::Combat::BLOCKED);
@@ -806,10 +806,10 @@ void BattleActionsController::onHexHovered(BattleHex hoveredHex)
}
if (!currentConsoleMsg.empty())
GH.statusbar->clearIfMatching(currentConsoleMsg);
GH.statusbar()->clearIfMatching(currentConsoleMsg);
if (!newConsoleMsg.empty())
GH.statusbar->write(newConsoleMsg);
GH.statusbar()->write(newConsoleMsg);
currentConsoleMsg = newConsoleMsg;
}
@@ -819,7 +819,7 @@ void BattleActionsController::onHoverEnded()
CCS->curh->set(Cursor::Combat::POINTER);
if (!currentConsoleMsg.empty())
GH.statusbar->clearIfMatching(currentConsoleMsg);
GH.statusbar()->clearIfMatching(currentConsoleMsg);
currentConsoleMsg.clear();
}
@@ -850,7 +850,7 @@ void BattleActionsController::onHexLeftClicked(BattleHex clickedHex)
{
actionRealize(action, clickedHex);
GH.statusbar->clear();
GH.statusbar()->clear();
}
else
{