games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Fix issue 1877. Allow to buy heroes in ally towns

Browse Source 
Also removed TODO because check already implemented in CGameHandler::hireHero
This commit is contained in:
ArseniyShestakov committed 2015-10-15 04:00:21 +03:00
1 parent fca4deaad2
commit 0d83f6fedd
1 file changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files
server/NetPacksServer.cpp
+3 -4
View File
@@ -209,10 +209,9 @@ bool SetFormation::applyGh( CGameHandler *gh )
bool HireHero::applyGh( CGameHandler *gh ) bool HireHero::applyGh( CGameHandler *gh )
{ {
const CGObjectInstance *obj = gh->getObj(tid); const CGObjectInstance *obj = gh->getObj(tid);
const CGTownInstance *town = dynamic_cast<const CGTownInstance *>(obj);
if(obj->ID == Obj::TOWN) if(town && PlayerRelations::ENEMIES == gh->getPlayerRelations(obj->tempOwner, gh->getPlayerAt(c)))
ERROR_IF_NOT_OWNS(tid); COMPLAIN_AND_RETURN("Can't buy hero in enemy town!");
//TODO check for visiting hero
return gh->hireHero(obj, hid,player); return gh->hireHero(obj, hid,player);
} }