games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-28 03:57:02 +02:00
Code Issues Releases Activity

Fixed #13 and #339

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2010-02-10 21:31:54 +00:00
parent ad65664914
commit 42fade07dc
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/CAdvmapInterface.cpp
View File

@ -535,6 +535,11 @@ void CTerrainRect::clickLeft(tribool down, bool previousState)
} }
} }
} }
else if(currentHero == vobjs.back()) //selected hero is standing at the town entrance
{
LOCPLINT->openHeroWindow(currentHero);
return;
}
//still here? we need to move hero if we clicked end of already selected path or calculate a new path otherwise //still here? we need to move hero if we clicked end of already selected path or calculate a new path otherwise
if (currentPath && currentPath->endPos() == mp)//we'll be moving if (currentPath && currentPath->endPos() == mp)//we'll be moving

5
lib/CGameState.cpp
View File

@ -1444,6 +1444,11 @@ void CGameState::init(StartInfo * si, Mapa * map, int Seed)
players.find(vhi->getOwner())->second.heroes.push_back(vhi); players.find(vhi->getOwner())->second.heroes.push_back(vhi);
hids.erase(vhi->subID); hids.erase(vhi->subID);
} }
for (unsigned int i=0; i<map->objects.size();i++) //heroes instances initialization
{
if (map->objects[i]->ID == 62)
hids.erase(map->objects[i]->subID);
}
for(unsigned int i=0; i<map->predefinedHeroes.size(); i++) for(unsigned int i=0; i<map->predefinedHeroes.size(); i++)
{ {
if(!vstd::contains(hids,map->predefinedHeroes[i]->subID)) if(!vstd::contains(hids,map->predefinedHeroes[i]->subID))

2
lib/map.cpp
View File

@ -1933,7 +1933,7 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
nobj->pos = pos; nobj->pos = pos;
nobj->ID = defInfo->id; nobj->ID = defInfo->id;
nobj->id = objects.size(); nobj->id = objects.size();
if(nobj->ID != HEROI_TYPE && nobj->ID != 214) if(nobj->ID != HEROI_TYPE && nobj->ID != 214 && nobj->ID != 62)
nobj->subID = defInfo->subid; nobj->subID = defInfo->subid;
nobj->defInfo = defInfo; nobj->defInfo = defInfo;
objects.push_back(nobj); objects.push_back(nobj);