From cddc0914c87df67a987cf40caeae07913851ee2e Mon Sep 17 00:00:00 2001
From: Capostrophic <Capostrophic@users.noreply.github.com>
Date: Mon, 9 Apr 2018 01:00:40 +0300
Subject: [PATCH] Option to charge for all companions travelling (fixes #4064)

---
 apps/openmw/mwgui/travelwindow.cpp | 7 ++++++-
 files/settings-default.cfg         | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 7586bb66a..7b65eb771 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/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,7 +74,10 @@ namespace MWGui
         MWWorld::ActionTeleport::getFollowersToTeleport(player, followers);
 
         // Apply followers cost, in vanilla one follower travels for free
-        price *= std::max(1, static_cast<int>(followers.size()));
+        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);
         toAdd->setEnabled(price <= playerGold);
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 8a28c42e4..46d9934fd 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -176,6 +176,9 @@ difficulty = 0
 # 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