2
0
DjWarmonger 13 жил өмнө
parent
commit
0665850d9d
2 өөрчлөгдсөн 8 нэмэгдсэн , 7 устгасан
  1. 2 2
      lib/CObjectHandler.cpp
  2. 6 5
      lib/map.cpp

+ 2 - 2
lib/CObjectHandler.cpp

@@ -4524,8 +4524,8 @@ void CGSeerHut::newTurn() const
 {
 	if (lastDay >= 0 && lastDay <= cb->getDate(0)) //time is up
 	{
-		cb->setObjProperty (id,11,0);
-		cb->setObjProperty (id,10,0);
+		cb->setObjProperty (id, 11, 0);
+		cb->setObjProperty (id, 10, 0);
 	}
 
 }

+ 6 - 5
lib/map.cpp

@@ -568,19 +568,20 @@ int Mapa::loadSeerHut( const ui8 * bufor, int i, CGObjectInstance *& nobj )
 	else //RoE
 	{
 		int artID = bufor[i]; ++i;
-		if(artID!=255) //not none quest
+		if (artID != 255) //not none quest
 		{
-			hut->m5arts.push_back(artID);
-			hut->missionType = 5;
+			hut->m5arts.push_back (artID);
+			hut->missionType = CQuest::MISSION_ART;
 		}
 		else
 		{
-			hut->missionType = 0; //no mission
+			hut->missionType = CQuest::MISSION_NONE; //no mission
 		}
+		hut->lastDay = -1; //no timeout
 		hut->isCustomFirst = hut->isCustomNext = hut->isCustomComplete = false;
 	}
 
-	if(hut->missionType)
+	if (hut->missionType)
 	{
 		ui8 rewardType = bufor[i]; ++i;
 		hut->rewardType = rewardType;