games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

- fix for #283

Browse Source 
- ally support: adventure map
This commit is contained in:
Ivan Savenko
2010-08-13 10:46:08 +00:00
parent 520d40cc59
commit fd45cd0a6d
10 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@@ -1888,7 +1888,7 @@ bool CGameHandler::moveHero( si32 hid, int3 dst, ui8 instant, ui8 asker /*= 255*
{
CGHeroInstance *dh = static_cast<CGHeroInstance *>(obj);
if( getPlayerRelations(dh->tempOwner, h->tempOwner))
if( gameState()->getPlayerRelations(dh->tempOwner, h->tempOwner))
{
heroExchange(h->id, dh->id);
return true;
@@ -2355,7 +2355,7 @@ void CGameHandler::heroExchange(si32 hero1, si32 hero2)
ui8 player1 = getHero(hero1)->tempOwner;
ui8 player2 = getHero(hero2)->tempOwner;
if( getPlayerRelations( player1, player2))
if( gameState()->getPlayerRelations( player1, player2))
{
OpenWindow hex;
hex.window = OpenWindow::EXCHANGE_WINDOW;
@@ -4553,7 +4553,7 @@ void CGameHandler::checkLossVictory( ui8 player )
sendAndApply(&iw);
peg.player = i->first;
peg.victory = getPlayerRelations(player, i->first) == 1; // ally of winner
peg.victory = gameState()->getPlayerRelations(player, i->first) == 1; // ally of winner
sendAndApply(&peg);
}
}