swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-30 15:13:12 -04:00
Code Issues Projects Releases Wiki Activity

Fixes for dealing with iterators in newer stlport versions

Browse Source
This commit is contained in:
Anonymous
2014-01-16 14:01:39 -07:00
parent 73fa952f77
commit bb542af614
10 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
+3 -3
View File
@@ -13368,7 +13368,7 @@ void CreatureObject::removeMissionCriticalObject(NetworkId const & networkId)
{
if (isAuthoritative())
{
MissionCriticalObjectSet::iterator iter = m_missionCriticalObjectSet.find(networkId);
MissionCriticalObjectSet::const_iterator iter = m_missionCriticalObjectSet.find(networkId);
if (iter != m_missionCriticalObjectSet.end())
{
m_missionCriticalObjectSet.erase(iter);
@@ -13421,7 +13421,7 @@ void CreatureObject::setGroupMissionCriticalObjects(GroupMissionCriticalObjectSe
//-- Anything that is not in the original set, we need to remove
{
for (GroupMissionCriticalObjectSet::iterator iter = m_groupMissionCriticalObjectSet.begin(); iter != m_groupMissionCriticalObjectSet.end(); ++iter)
for (GroupMissionCriticalObjectSet::const_iterator iter(m_groupMissionCriticalObjectSet.begin()); iter != m_groupMissionCriticalObjectSet.end(); ++iter)
if (groupMissionCriticalObjectSet.find(*iter) == groupMissionCriticalObjectSet.end())
m_groupMissionCriticalObjectSet.erase(*iter);
}
@@ -14622,7 +14622,7 @@ bool CreatureObject::clearAllExpertises()
//@TODO: guard this however design wants
const SkillList &skills = getSkillList();
std::vector<const SkillObject *> skillsToRevoke;
for(std::set<const SkillObject *>::iterator i = skills.begin(); i != skills.end(); ++i)
for(std::set<const SkillObject *>::const_iterator i(skills.begin()); i != skills.end(); ++i)
{
const SkillObject *skill = *i;
if(skill && ExpertiseManager::isExpertise(skill))