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

Squashed commit of PR #314:

Browse Source 
commit 437c6c6fd4931abe69d3b7fe501b231a74182159
Author: Piotr Wójcik <chocimier@tlen.pl>
Date:   Sat Jun 24 18:36:16 2017 +0200

    Rename CPlayersVisited to CTeamVisited

commit baf1423cd9b090eaaa0a6962f2bd0f440e2e0747
Author: Piotr Wójcik <chocimier@tlen.pl>
Date:   Wed Jun 21 16:41:37 2017 +0200

    Share visited status of CPlayersVisited objects across team
This commit is contained in:
Piotr Wójcik
2017-06-30 23:39:37 +03:00
committed by Arseniy Shestakov
parent 29e50cc21c
commit 7bc9853175
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapObjects/MiscObjects.cpp
View File

@@ -60,18 +60,18 @@ static std::string & visitedTxt(const bool visited)
return VLC->generaltexth->allTexts[id];
}
void CPlayersVisited::setPropertyDer( ui8 what, ui32 val )
void CTeamVisited::setPropertyDer(ui8 what, ui32 val)
{
if(what == CPlayersVisited::OBJPROP_VISITED)
if(what == CTeamVisited::OBJPROP_VISITED)
players.insert(PlayerColor(val));
}
bool CPlayersVisited::wasVisited( PlayerColor player ) const
bool CTeamVisited::wasVisited(PlayerColor player) const
{
return vstd::contains(players,player);
return wasVisited(cb->getPlayer(player)->team);
}
bool CPlayersVisited::wasVisited( TeamID team ) const
bool CTeamVisited::wasVisited(TeamID team) const
{
for(auto i : players)
{
@@ -2127,7 +2127,7 @@ void CGObelisk::setPropertyDer( ui8 what, ui32 val )
break;
}
default:
CPlayersVisited::setPropertyDer(what, val);
CTeamVisited::setPropertyDer(what, val);
break;
}
}