Make player walkthrough optional

Fix inverted condition
otland · Aug 4, 2015 · 5ff1c2f · 5ff1c2f
1 parent c6a463b
commit 5ff1c2f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -79,6 +79,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
@@ -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
@@ -821,7 +821,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;
 	}
 
@@ -857,7 +857,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;
 	}