1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00

Merge branch 'develop' into feature/nullkiller2

This commit is contained in:
Mircea TheHonestCTO
2025-10-03 16:38:57 +02:00
16 changed files with 533 additions and 113 deletions

View File

@@ -18,6 +18,7 @@
#include "../GameEngine.h"
#include "../gui/CursorHandler.h"
#include "../gui/MouseButton.h"
#include "../render/IScreenHandler.h"
#include "../CPlayerInterface.h"
#include "../adventureMap/CInGameConsole.h"
@@ -99,7 +100,7 @@ void MapViewActions::mouseDragged(const Point & cursorPosition, const Point & la
{
dragDistance += lastUpdateDistance;
if (dragDistance.length() > 16)
if ((dragDistance.length() * ENGINE->screenHandler().getInterfaceScalingPercentage() / 100) > 12)
dragActive = true;
if (dragActive && settings["adventure"]["leftButtonDrag"].Bool())