From e0dc6573bf1ef997cd6f33b2f9b901846f6de134 Mon Sep 17 00:00:00 2001
From: DjWarmonger <warmonger@vp.pl>
Date: Sun, 6 Jun 2010 09:50:37 +0000
Subject: [PATCH] Fixed #427 & #487

---
 hch/CObjectHandler.cpp | 13 +++++++++----
 lib/map.cpp            | 17 +++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/hch/CObjectHandler.cpp b/hch/CObjectHandler.cpp
index a1113de7c..9addfcc00 100644
--- a/hch/CObjectHandler.cpp
+++ b/hch/CObjectHandler.cpp
@@ -3271,14 +3271,19 @@ void CGSeerHut::initObj()
 	seerName = VLC->generaltexth->seerNames[ran()%VLC->generaltexth->seerNames.size()];
 	textOption = ran()%3;
 	progress = 0;
-	if (missionType && !isCustom)
+	if (missionType)
 	{
-		firstVisitText = VLC->generaltexth->quests[missionType-1][0][textOption];
-		nextVisitText = VLC->generaltexth->quests[missionType-1][1][textOption];
-		completedText = VLC->generaltexth->quests[missionType-1][2][textOption];
+		if (!isCustom)
+		{
+		
+			firstVisitText = VLC->generaltexth->quests[missionType-1][0][textOption];
+			nextVisitText = VLC->generaltexth->quests[missionType-1][1][textOption];
+			completedText = VLC->generaltexth->quests[missionType-1][2][textOption];
+		}
 	}
 	else
 		firstVisitText = VLC->generaltexth->seerEmpty[textOption];
+
 }
 
 const std::string & CGSeerHut::getHoverText() const
diff --git a/lib/map.cpp b/lib/map.cpp
index e11014539..462f5ab03 100644
--- a/lib/map.cpp
+++ b/lib/map.cpp
@@ -1045,21 +1045,21 @@ void Mapa::readHeader( const unsigned char * bufor, int &i)
 	i+=31; //omitting NULLS
 
 	allowedArtifact.resize(ARTIFACTS_QUANTITY);
-	for(unsigned int x=0;x<allowedArtifact.size();x++)
+	for (unsigned int x=0; x<allowedArtifact.size(); x++)
 		allowedArtifact[x] = true;
 
 	//reading allowed artifacts:  17 or 18 bytes
-	if(version!=RoE)
+	if (version!=RoE)
 	{
 		ist=i; //starting i for loop
-		for(i; i<ist+(version==AB ? 17 : 18); ++i)
+		for (i; i<ist+(version==AB ? 17 : 18); ++i)
 		{
 			unsigned char c = bufor[i];
-			for(int yy=0; yy<8; ++yy)
+			for (int yy=0; yy<8; ++yy)
 			{
-				if((i-ist)*8+yy < ARTIFACTS_QUANTITY)
+				if ((i-ist)*8+yy < ARTIFACTS_QUANTITY)
 				{
-					if(c == (c|((unsigned char)intPow(2, yy))))
+					if (c == (c|((unsigned char)intPow(2, yy))))
 						allowedArtifact[(i-ist)*8+yy] = false;
 				}
 			}
@@ -1831,6 +1831,7 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
 				nobj = new CGMagicWell();
 				break;
 			}
+		case 15: //Cover of darkness
 		case 58: //Redwood Observatory
 		case 60: //Pillar of Fire
 			{
@@ -2094,9 +2095,9 @@ void Mapa::loadQuest(CQuest * guard, const unsigned char * bufor, int & i)
 	guard->nextVisitText = readString(bufor,i);
 	guard->completedText = readString(bufor,i);
 	if (guard->firstVisitText.size() && guard->nextVisitText.size() && guard->completedText.size())
-		guard->isCustom = false; //randomize all if any text is missing
-	else
 		guard->isCustom = true;
+	else
+		guard->isCustom = false;  //randomize all if any text is missing
 }
 
 TerrainTile & Mapa::getTile( int3 tile )