|
@@ -27,6 +27,7 @@
|
|
|
#include "../../lib/ArtifactUtils.h"
|
|
#include "../../lib/ArtifactUtils.h"
|
|
|
#include "../../lib/CGeneralTextHandler.h"
|
|
#include "../../lib/CGeneralTextHandler.h"
|
|
|
#include "../../lib/CCreatureHandler.h"
|
|
#include "../../lib/CCreatureHandler.h"
|
|
|
|
|
+#include "../../lib/CConfigHandler.h"
|
|
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
|
#include "../../lib/mapObjects/CGHeroInstance.h"
|
|
|
#include "../../lib/TextOperations.h"
|
|
#include "../../lib/TextOperations.h"
|
|
|
#include "../../lib/gameState/CGameState.h"
|
|
#include "../../lib/gameState/CGameState.h"
|
|
@@ -353,6 +354,9 @@ void CGarrisonSlot::gesture(bool on, const Point & initialPosition, const Point
|
|
|
if(!myStack)
|
|
if(!myStack)
|
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
|
|
+ if (!settings["input"]["radialWheelGarrisonSwipe"].Bool())
|
|
|
|
|
+ return;
|
|
|
|
|
+
|
|
|
const auto * otherArmy = upg == EGarrisonType::UPPER ? owner->lowerArmy() : owner->upperArmy();
|
|
const auto * otherArmy = upg == EGarrisonType::UPPER ? owner->lowerArmy() : owner->upperArmy();
|
|
|
|
|
|
|
|
bool stackExists = myStack != nullptr;
|
|
bool stackExists = myStack != nullptr;
|