diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp index 7b852075f..f098dcaa2 100644 --- a/apps/launcher/advancedpage.cpp +++ b/apps/launcher/advancedpage.cpp @@ -74,7 +74,6 @@ bool Launcher::AdvancedPage::loadSettings() loadSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game"); loadSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game"); loadSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game"); - loadSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game"); loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game"); loadSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game"); int unarmedFactorsStrengthIndex = mEngineSettings.getInt("strength influences hand to hand", "Game"); @@ -135,7 +134,6 @@ void Launcher::AdvancedPage::saveSettings() saveSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game"); saveSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game"); saveSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game"); - saveSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game"); saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game"); saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game"); int unarmedFactorsStrengthIndex = unarmedFactorsStrengthComboBox->currentIndex(); diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp index 0ce864556..81cd76089 100644 --- a/apps/openmw/mwgui/travelwindow.cpp +++ b/apps/openmw/mwgui/travelwindow.cpp @@ -71,11 +71,8 @@ namespace MWGui std::set followers; MWWorld::ActionTeleport::getFollowersToTeleport(player, followers); - // Apply followers cost, in vanilla one follower travels for free - if (Settings::Manager::getBool("charge for every follower travelling", "Game")) - price *= 1 + static_cast(followers.size()); - else - price *= std::max(1, static_cast(followers.size())); + // Apply followers cost, unlike vanilla the first follower doesn't travel for free + price *= 1 + static_cast(followers.size()); int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2; diff --git a/files/settings-default.cfg b/files/settings-default.cfg index 311f8b42f..71260c37b 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -225,9 +225,6 @@ classic reflected absorb spells behavior = true # Show duration of magic effect and lights in the spells window. show effect duration = false -# Account for the first follower in fast travel cost calculations. -charge for every follower travelling = false - # Prevent merchants from equipping items that are sold to them. prevent merchant equipping = false diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui index 0ca65b996..4aaffe936 100644 --- a/files/ui/advancedpage.ui +++ b/files/ui/advancedpage.ui @@ -56,16 +56,6 @@ - - - - <html><head/><body><p>Account for the first follower in fast travel cost calculations.</p></body></html> - - - Charge for every follower travelling - - -