games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Swapped functions of Ctrl and Shift on adventure map

Browse Source
This commit is contained in:
Ivan Savenko 2024-06-11 16:00:22 +00:00
parent 9c05e80315
commit fc1a20239e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/adventureMap/AdventureMapInterface.cpp
View File

@ -564,7 +564,7 @@ void AdventureMapInterface::onTileLeftClicked(const int3 &targetPosition)
} }
else else
{ {
if(GH.isKeyboardCmdDown()) //normal click behaviour (as no hero selected) if(GH.isKeyboardShiftDown()) //normal click behaviour (as no hero selected)
{ {
if(canSelect) if(canSelect)
LOCPLINT->localState->setSelection(static_cast<const CArmedInstance*>(topBlocking)); LOCPLINT->localState->setSelection(static_cast<const CArmedInstance*>(topBlocking));
@ -643,19 +643,19 @@ void AdventureMapInterface::onTileHovered(const int3 &targetPosition)
objRelations = LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, objAtTile->tempOwner); objRelations = LOCPLINT->cb->getPlayerRelations(LOCPLINT->playerID, objAtTile->tempOwner);
std::string text = LOCPLINT->localState->getCurrentHero() ? objAtTile->getHoverText(LOCPLINT->localState->getCurrentHero()) : objAtTile->getHoverText(LOCPLINT->playerID); std::string text = LOCPLINT->localState->getCurrentHero() ? objAtTile->getHoverText(LOCPLINT->localState->getCurrentHero()) : objAtTile->getHoverText(LOCPLINT->playerID);
boost::replace_all(text,"\n"," "); boost::replace_all(text,"\n"," ");
if (GH.isKeyboardShiftDown()) if (GH.isKeyboardCmdDown())
text.append(" (" + std::to_string(targetPosition.x) + ", " + std::to_string(targetPosition.y) + ")"); text.append(" (" + std::to_string(targetPosition.x) + ", " + std::to_string(targetPosition.y) + ")");
GH.statusbar()->write(text); GH.statusbar()->write(text);
} }
else if(isTargetPositionVisible) else if(isTargetPositionVisible)
{ {
std::string tileTooltipText = CGI->mh->getTerrainDescr(targetPosition, false); std::string tileTooltipText = CGI->mh->getTerrainDescr(targetPosition, false);
if (GH.isKeyboardShiftDown()) if (GH.isKeyboardCmdDown())
tileTooltipText.append(" (" + std::to_string(targetPosition.x) + ", " + std::to_string(targetPosition.y) + ")"); tileTooltipText.append(" (" + std::to_string(targetPosition.x) + ", " + std::to_string(targetPosition.y) + ")");
GH.statusbar()->write(tileTooltipText); GH.statusbar()->write(tileTooltipText);
} }
if(LOCPLINT->localState->getCurrentArmy()->ID == Obj::TOWN || GH.isKeyboardCtrlDown()) if(LOCPLINT->localState->getCurrentArmy()->ID == Obj::TOWN || GH.isKeyboardShiftDown())
{ {
if(objAtTile) if(objAtTile)
{ {