games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-20 09:49:37 +02:00
Code Issues Releases Activity

Renamed CGuiHandler to GameEngine

Browse Source 
- class CGuiHandler is now called GameEngine to better describe its
functionality
- renamed global GH to more clear ENGINE
- GH/ENGINE is now unique_ptr to make construction / deconstruction
order more clear and to allow interface / implementation split
- CGuiHandler.cpp/h is now called GameEngine.cpp/h and located in root
directory of client dir
This commit is contained in:
Ivan Savenko
2025-02-10 21:49:23 +00:00
parent 0c5a560c80
commit cacceda950
144 changed files with 1019 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/windows/CExchangeWindow.cpp
+9 -9
View File
@@ -15,7 +15,7 @@
#include "../CGameInfo.h"
#include "../CPlayerInterface.h"
#include "../gui/CGuiHandler.h"
#include "../GameEngine.h"
#include "../gui/CursorHandler.h"
#include "../gui/Shortcut.h"
#include "../gui/WindowHandler.h"
@@ -266,11 +266,11 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
void CExchangeWindow::creatureArrowButtonCallback(bool leftToRight, SlotID slotId)
{
if (GH.isKeyboardAltDown())
if (ENGINE->isKeyboardAltDown())
controller.moveArmy(leftToRight, slotId);
else if (GH.isKeyboardCtrlDown())
else if (ENGINE->isKeyboardCtrlDown())
controller.moveSingleStackCreature(leftToRight, slotId, true);
else if (GH.isKeyboardShiftDown())
else if (ENGINE->isKeyboardShiftDown())
controller.moveSingleStackCreature(leftToRight, slotId, false);
else
controller.moveStack(leftToRight, slotId);
@@ -278,15 +278,15 @@ void CExchangeWindow::creatureArrowButtonCallback(bool leftToRight, SlotID slotI
void CExchangeWindow::moveArtifactsCallback(bool leftToRight)
{
bool moveEquipped = !GH.isKeyboardShiftDown();
bool moveBackpack = !GH.isKeyboardCmdDown();
bool moveEquipped = !ENGINE->isKeyboardShiftDown();
bool moveBackpack = !ENGINE->isKeyboardCmdDown();
controller.moveArtifacts(leftToRight, moveEquipped, moveBackpack);
};
void CExchangeWindow::swapArtifactsCallback()
{
bool moveEquipped = !GH.isKeyboardShiftDown();
bool moveBackpack = !GH.isKeyboardCmdDown();
bool moveEquipped = !ENGINE->isKeyboardShiftDown();
bool moveBackpack = !ENGINE->isKeyboardCmdDown();
controller.swapArtifacts(moveEquipped, moveBackpack);
}
@@ -300,7 +300,7 @@ void CExchangeWindow::moveUnitsShortcut(bool leftToRight)
void CExchangeWindow::backpackShortcut(bool leftHero)
{
GH.windows().createAndPushWindow<CHeroBackpackWindow>(heroInst[leftHero ? 0 : 1], artSets);
ENGINE->windows().createAndPushWindow<CHeroBackpackWindow>(heroInst[leftHero ? 0 : 1], artSets);
};
void CExchangeWindow::keyPressed(EShortcut key)