Bladeren bron

Fix initialization of movement speed settings

Ivan Savenko 2 jaren geleden
bovenliggende
commit
59d8989399
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 1 1
      client/mapView/MapView.cpp
  2. 3 3
      client/windows/settings/AdventureOptionsTab.cpp

+ 1 - 1
client/mapView/MapView.cpp

@@ -120,7 +120,7 @@ void MapView::onMapSwiped(const Point & viewPosition)
 
 void MapView::onMapSwipeEnded()
 {
-	isSwiping = true;
+	isSwiping = false;
 }
 
 void MapView::onCenteredTile(const int3 & tile)

+ 3 - 3
client/windows/settings/AdventureOptionsTab.cpp

@@ -71,13 +71,13 @@ AdventureOptionsTab::AdventureOptionsTab()
 	build(config);
 
 	std::shared_ptr<CToggleGroup> playerHeroSpeedToggle = widget<CToggleGroup>("heroMovementSpeedPicker");
-	playerHeroSpeedToggle->setSelected(static_cast<int>(settings["adventure"]["heroSpeed"].Float()));
+	playerHeroSpeedToggle->setSelected(static_cast<int>(settings["adventure"]["heroMoveTime"].Float()));
 
 	std::shared_ptr<CToggleGroup> enemyHeroSpeedToggle = widget<CToggleGroup>("enemyMovementSpeedPicker");
-	enemyHeroSpeedToggle->setSelected(static_cast<int>(settings["adventure"]["enemySpeed"].Float()));
+	enemyHeroSpeedToggle->setSelected(static_cast<int>(settings["adventure"]["enemyMoveTime"].Float()));
 
 	std::shared_ptr<CToggleGroup> mapScrollSpeedToggle = widget<CToggleGroup>("mapScrollSpeedPicker");
-	mapScrollSpeedToggle->setSelected(static_cast<int>(settings["adventure"]["scrollSpeed"].Float()));
+	mapScrollSpeedToggle->setSelected(static_cast<int>(settings["adventure"]["scrollSpeedPixels"].Float()));
 
 	std::shared_ptr<CToggleButton> heroReminderCheckbox = widget<CToggleButton>("heroReminderCheckbox");
 	heroReminderCheckbox->setSelected(settings["adventure"]["heroReminder"].Bool());