Always account for every follower travelling

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();

apps/openmw/mwgui/travelwindow.cpp

@@ -71,11 +71,8 @@ namespace MWGui
         std::set<MWWorld::Ptr> 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<int>(followers.size());
-        else
-            price *= std::max(1, static_cast<int>(followers.size()));
+        // Apply followers cost, unlike vanilla the first follower doesn't travel for free
+        price *= 1 + static_cast<int>(followers.size());
 
         int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2;
 

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
 

files/ui/advancedpage.ui

@@ -56,16 +56,6 @@
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="chargeForEveryFollowerCheckBox">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Account for the first follower in fast travel cost calculations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Charge for every follower travelling</string>
-            </property>
-           </widget>
-          </item>
           <item>
            <widget class="QCheckBox" name="enchantedWeaponsMagicalCheckBox">
             <property name="toolTip">