games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixed #585 and #588.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-10-31 19:17:26 +00:00
parent 1f2e9bf9c2
commit dc5370ad6e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CCastleInterface.cpp
View File

@@ -603,7 +603,11 @@ void CCastleInterface::buildingClicked(int building)
/*Tower*/ case 2://Artifact Merchant /*Tower*/ case 2://Artifact Merchant
/*Dungeon*/ case 5://Artifact Merchant /*Dungeon*/ case 5://Artifact Merchant
/*Conflux*/ case 8://Artifact Merchant /*Conflux*/ case 8://Artifact Merchant
if(town->visitingHero)
GH.pushInt(new CMarketplaceWindow(town, town->visitingHero, RESOURCE_ARTIFACT)); GH.pushInt(new CMarketplaceWindow(town, town->visitingHero, RESOURCE_ARTIFACT));
else
LOCPLINT->showInfoDialog(boost::str(boost::format(CGI->generaltexth->allTexts[273]) % b->Name())); //Only visiting heroes may use the %s.
break; break;
default: default:
defaultBuildingClicked(building); defaultBuildingClicked(building);

1
client/CPlayerInterface.cpp
View File

@@ -1084,7 +1084,6 @@ bool CPlayerInterface::moveHero( const CGHeroInstance *h, CGPath path )
bool guarded = CGI->mh->map->isInTheMap(cb->guardingCreaturePosition(endpos - int3(1, 0, 0))); bool guarded = CGI->mh->map->isInTheMap(cb->guardingCreaturePosition(endpos - int3(1, 0, 0)));
cb->moveHero(h,endpos); cb->moveHero(h,endpos);
curTile = cb->getTileInfo(endpos);
eventsM.unlock(); eventsM.unlock();
while(stillMoveHero.data != STOP_MOVE && stillMoveHero.data != CONTINUE_MOVE) while(stillMoveHero.data != STOP_MOVE && stillMoveHero.data != CONTINUE_MOVE)