make-player-walkthrough-optional.patch

From 275f39c3faa61e59383915288de85cc90d9aca06 Mon Sep 17 00:00:00 2001
From: Ranieri Althoff <ranisalt@gmail.com>
Date: Sun, 19 Apr 2015 03:47:18 -0300
Subject: [PATCH 1/1] Make player walkthrough optional

---
 config.lua            | 1 +
 src/configmanager.cpp | 1 +
 src/configmanager.h   | 1 +
 src/player.cpp        | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config.lua b/config.lua
index 927cc2b..39ffec8 100644
--- a/config.lua
+++ b/config.lua
@@ -24,6 +24,7 @@ maxPlayers = 0
 motd = "Welcome to The Forgotten Server!"
 onePlayerOnlinePerAccount = true
 allowClones = false
+allowWalkthrough = true
 serverName = "Forgotten"
 statusTimeout = 5000
 replaceKickOnLogin = true
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 897c002..c121dc4 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -82,6 +82,7 @@ bool ConfigManager::load()
 	boolean[FREE_PREMIUM] = getGlobalBoolean(L, "freePremium", false);
 	boolean[REPLACE_KICK_ON_LOGIN] = getGlobalBoolean(L, "replaceKickOnLogin", true);
 	boolean[ALLOW_CLONES] = getGlobalBoolean(L, "allowClones", false);
+	boolean[ALLOW_WALKTHROUGH] = getGlobalBoolean(L, "allowWalkthrough", true);
 	boolean[MARKET_PREMIUM] = getGlobalBoolean(L, "premiumToCreateMarketOffer", true);
 	boolean[EMOTE_SPELLS] = getGlobalBoolean(L, "emoteSpells", false);
 	boolean[STAMINA_SYSTEM] = getGlobalBoolean(L, "staminaSystem", true);
diff --git a/src/configmanager.h b/src/configmanager.h
index 9dfa46d..bdd33b6 100644
--- a/src/configmanager.h
+++ b/src/configmanager.h
@@ -36,6 +36,7 @@ class ConfigManager
 			FREE_PREMIUM,
 			REPLACE_KICK_ON_LOGIN,
 			ALLOW_CLONES,
+			ALLOW_WALKTHROUGH,
 			BIND_ONLY_GLOBAL_ADDRESS,
 			OPTIMIZE_DATABASE,
 			MARKET_PREMIUM,
diff --git a/src/player.cpp b/src/player.cpp
index c9e1ab8..1ea5f4c 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -825,7 +825,7 @@ bool Player::canWalkthrough(const Creature* creature) const
 	}
 
 	const Player* player = creature->getPlayer();
-	if (!player) {
+	if (!player || !g_config.getBoolean(ConfigManager::ALLOW_WALKTHROUGH)) {
 		return false;
 	}
 
@@ -861,7 +861,7 @@ bool Player::canWalkthroughEx(const Creature* creature) const
 	}
 
 	const Player* player = creature->getPlayer();
-	if (!player) {
+	if (!player || !g_config.getBoolean(ConfigManager::ALLOW_WALKTHROUGH)) {
 		return false;
 	}
 
-- 
2.3.5