Merge pull request #1671

apps/openmw/mwgui/travelwindow.cpp

@@ -4,6 +4,8 @@
 #include <MyGUI_ScrollView.h>
 #include <MyGUI_Gui.h>
 
+#include <components/settings/settings.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -72,6 +74,9 @@ namespace MWGui
         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()));
 
         MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>("SandTextButton", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default);

files/settings-default.cfg

@@ -182,6 +182,9 @@ classic reflect absorb attribute 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
+
 # Prevents merchants from equipping items that are sold to them.
 prevent merchant equipping = false