diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp index e6323803..261801f8 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.cpp @@ -242,10 +242,10 @@ void plAGAnimInstance::DetachChannels() do { plAGChannel *channel = (*i).second; channelMod->DetachChannel(channel); - } while (i != fManualDetachChannels.end() && (*++i).first == channelName); + } while (++i != fManualDetachChannels.end() && i->first == channelName); } else { do { - } while (i != fManualDetachChannels.end() && (*++i).first == channelName); + } while (++i != fManualDetachChannels.end() && i->first == channelName); } } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp index aec162f9..682be7d5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp @@ -227,12 +227,12 @@ plAGChannel * plAGModifier::MergeChannel(plAGApplicator *app, // DETACHCHANNEL hsBool plAGModifier::DetachChannel(plAGChannel * channel) { - plAppTable::iterator i = fApps.begin(); + size_t i = 0; hsBool done = false; - for( ; i != fApps.end(); i++) + for( ; i != fApps.size(); i++) { - plAGApplicator *app = *i; + plAGApplicator *app = fApps[i]; plAGChannel *existingChannel = app->GetChannel(); if(existingChannel) { @@ -243,9 +243,8 @@ hsBool plAGModifier::DetachChannel(plAGChannel * channel) app->SetChannel(replacementChannel); if( ! replacementChannel && app->AutoDelete()) { - plAppTable::iterator old = i; + fApps.erase(fApps.begin()+i); i--; - fApps.erase(old); delete app; } done = true; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp index ca53c76c..13180bc4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp @@ -624,7 +624,7 @@ void plObjectInVolumeDetector::IHandleEval(plEvalMsg* pEval) { plgDispatch::Dispatch()->UnRegisterForExactType(plEvalMsg::Index(), GetKey()); fWaitingForEval = false; - for(bookKeepingList::iterator it= (--fCollisionList.end());it!=(--fCollisionList.begin()); it--) + for(bookKeepingList::iterator it= fCollisionList.begin();it!=fCollisionList.end(); it++) { bool alreadyInside; ResidentSet::iterator HitIt;