Merge branch 'stlfixups' into numlockfix

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt

@@ -3,6 +3,11 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
+if(Bink_SDK_AVAILABLE)
+	include_directories(${Bink_INCLUDE_DIR})
+endif()
+include_directories(${DirectX_INCLUDE_DIR})
+
 if(WIN32)
 	add_definitions(-DWIN32)
 endif(WIN32)

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);
 		}
 	}
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp

@@ -228,9 +228,8 @@ plAGChannel * plAGModifier::MergeChannel(plAGApplicator *app,
 hsBool plAGModifier::DetachChannel(plAGChannel * channel)
 {
 	plAppTable::iterator i = fApps.begin();
-	hsBool done = false;
 
-	for( ; i != fApps.end(); i++)
+	while( i != fApps.end() )
 	{
 		plAGApplicator *app = *i;
 		plAGChannel *existingChannel = app->GetChannel();
@@ -243,17 +242,16 @@ hsBool plAGModifier::DetachChannel(plAGChannel * channel)
 				app->SetChannel(replacementChannel);
 				if( ! replacementChannel && app->AutoDelete())
 				{
-					plAppTable::iterator old = i;
+					// Don't need to adjust the iterator since we're about to exit the loop
-					i--;
+					fApps.erase(i);
-					fApps.erase(old);
 					delete app;
 				}
-				done = true;
+				return true;
-				break;
 			}
 		}
+		++i;
 	}
-	return done;
+	return false;
 }
 
 // READ

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::reverse_iterator it= fCollisionList.rbegin();it!=fCollisionList.rend(); it++)
 		{
 			bool alreadyInside;
 			ResidentSet::iterator HitIt;
@@ -1152,4 +1152,4 @@ hsBool  plRidingAnimatedPhysicalDetector::MsgReceive(plMessage *msg)
 		return true;
 	}
 	return plSimpleRegionSensor::MsgReceive(msg);
-}
+}