games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Fixed #1024

Browse Source
This commit is contained in:
DjWarmonger
2012-07-21 09:58:42 +00:00
parent 356e675a65
commit 0665850d9d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CObjectHandler.cpp
View File

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

11
lib/map.cpp
View File

@ -568,19 +568,20 @@ int Mapa::loadSeerHut( const ui8 * bufor, int i, CGObjectInstance *& nobj )
else //RoE else //RoE
{ {
int artID = bufor[i]; ++i; int artID = bufor[i]; ++i;
if(artID!=255) //not none quest if (artID != 255) //not none quest
{ {
hut->m5arts.push_back(artID); hut->m5arts.push_back (artID);
hut->missionType = 5; hut->missionType = CQuest::MISSION_ART;
} }
else 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; hut->isCustomFirst = hut->isCustomNext = hut->isCustomComplete = false;
} }
if(hut->missionType) if (hut->missionType)
{ {
ui8 rewardType = bufor[i]; ++i; ui8 rewardType = bufor[i]; ++i;
hut->rewardType = rewardType; hut->rewardType = rewardType;