From 0034ddd5b1b2bfab213ec2623dfa9c0dba8b3d02 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 23 Aug 2021 05:54:37 +0200
Subject: [PATCH] Clean up IsTownerPresent

---
 Source/towners.cpp | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/Source/towners.cpp b/Source/towners.cpp
index 5027938f4..124d027ec 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -812,23 +812,16 @@ bool IsTownerPresent(_talker_id npc)
 {
 	switch (npc) {
 	case TOWN_DEADGUY:
-		if (Quests[Q_BUTCHER]._qactive == QUEST_NOTAVAIL || Quests[Q_BUTCHER]._qactive == QUEST_DONE)
-			return false;
-		break;
+		return Quests[Q_BUTCHER]._qactive != QUEST_NOTAVAIL && Quests[Q_BUTCHER]._qactive != QUEST_DONE;
 	case TOWN_FARMER:
-		if (!gbIsHellfire || sgGameInitInfo.bCowQuest != 0 || Quests[Q_FARMER]._qactive == QUEST_HIVE_DONE)
-			return false;
-		break;
+		return gbIsHellfire && sgGameInitInfo.bCowQuest == 0 && Quests[Q_FARMER]._qactive != QUEST_HIVE_DONE;
 	case TOWN_COWFARM:
-		if (!gbIsHellfire || sgGameInitInfo.bCowQuest == 0)
-			return false;
-		break;
+		return gbIsHellfire && sgGameInitInfo.bCowQuest != 0;
 	case TOWN_GIRL:
-		if (!gbIsHellfire || sgGameInitInfo.bTheoQuest == 0 || !Players->_pLvlVisited[17] || Quests[Q_GIRL]._qactive == QUEST_DONE)
-			return false;
-		break;
+		return gbIsHellfire && sgGameInitInfo.bTheoQuest != 0 && Players->_pLvlVisited[17] && Quests[Q_GIRL]._qactive != QUEST_DONE;
+	default:
+		return true;
 	}
-	return true;
 }
 
 void InitTowners()