mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-26 03:52:01 +02:00
* fixed #863 — all members of team will receive notification about FoW change
* fixed #486 * removed reference to a deleted file from lib VC project file
This commit is contained in:
parent
386ac80cf9
commit
5afa5cfb54
@ -156,10 +156,15 @@ void SetMovePoints::applyCl( CClient *cl )
|
|||||||
|
|
||||||
void FoWChange::applyCl( CClient *cl )
|
void FoWChange::applyCl( CClient *cl )
|
||||||
{
|
{
|
||||||
if(mode)
|
|
||||||
INTERFACE_CALL_IF_PRESENT(player, tileRevealed, tiles);
|
BOOST_FOREACH(auto &i, cl->playerint)
|
||||||
else
|
if(cl->getPlayerRelations(i.first, player) > 0) //ally or the same player
|
||||||
INTERFACE_CALL_IF_PRESENT(player, tileHidden, tiles);
|
{
|
||||||
|
if(mode)
|
||||||
|
i.second->tileRevealed(tiles);
|
||||||
|
else
|
||||||
|
i.second->tileHidden(tiles);
|
||||||
|
}
|
||||||
|
|
||||||
cl->invalidatePaths();
|
cl->invalidatePaths();
|
||||||
}
|
}
|
||||||
@ -368,10 +373,9 @@ void TryMoveHero::applyCl( CClient *cl )
|
|||||||
|
|
||||||
int player = h->tempOwner;
|
int player = h->tempOwner;
|
||||||
|
|
||||||
if(vstd::contains(cl->playerint,player))
|
BOOST_FOREACH(auto &i, cl->playerint)
|
||||||
{
|
if(cl->getPlayerRelations(i.first, player) > 0) //ally or the same player
|
||||||
cl->playerint[player]->tileRevealed(fowRevealed);
|
i.second->tileRevealed(fowRevealed);
|
||||||
}
|
|
||||||
|
|
||||||
//notify interfaces about move
|
//notify interfaces about move
|
||||||
for(std::map<ui8, CGameInterface*>::iterator i=cl->playerint.begin();i!=cl->playerint.end();i++)
|
for(std::map<ui8, CGameInterface*>::iterator i=cl->playerint.begin();i!=cl->playerint.end();i++)
|
||||||
|
@ -132,8 +132,8 @@ void CDefObjInfoHandler::load()
|
|||||||
if(i)
|
if(i)
|
||||||
{
|
{
|
||||||
gobjs[124][i] = new CGDefInfo(*gobjs[124][0]);
|
gobjs[124][i] = new CGDefInfo(*gobjs[124][0]);
|
||||||
gobjs[124][i]->name = holeDefs[i];
|
|
||||||
}
|
}
|
||||||
|
gobjs[124][i]->name = holeDefs[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,7 +262,6 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\Global.h" />
|
<ClInclude Include="..\Global.h" />
|
||||||
<ClInclude Include="..\StartInfo.h" />
|
|
||||||
<ClInclude Include="AI_Base.h" />
|
<ClInclude Include="AI_Base.h" />
|
||||||
<ClInclude Include="BattleAction.h" />
|
<ClInclude Include="BattleAction.h" />
|
||||||
<ClInclude Include="BattleHex.h" />
|
<ClInclude Include="BattleHex.h" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user