Update3 for MSVC10

Fix some const problems.

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp

@@ -1970,11 +1970,11 @@ bool IsExpired()
 		void* desc = nil;
 		if (VerQueryValue(data, "\\StringFileInfo\\040904B0\\FileDescription", &desc, &descLen))
 		{
-			char* buildDateStart = strstr((const char*)desc, " - Built ");
+			const char* buildDateStart = strstr((const char*)desc, " - Built ");
 			if (buildDateStart)
 			{
 				buildDateStart += strlen(" - Built ");
-				char* buildDateEnd = strstr(buildDateStart, " at");
+				const char* buildDateEnd = strstr(buildDateStart, " at");
 				if (buildDateEnd)
 				{
 					int len = buildDateEnd-buildDateStart;

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp

@@ -218,12 +218,12 @@ void	plAgeDescription::SetAgeNameFromPath( const char *path )
 	}
 
 	// Construct our name from the path
-	char *pathSep1 = strrchr( path, '\\' );
+	const char *pathSep1 = strrchr( path, '\\' );
-	char *pathSep2 = strrchr( path, '/' );
+	const char *pathSep2 = strrchr( path, '/' );
 	if( pathSep2 > pathSep1 )
 		pathSep1 = pathSep2;
 	if( pathSep1 == nil )
-		pathSep1 = (char *)path;
+		pathSep1 = path;
 	else
 		pathSep1++;	// Get past the actual character we found
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h

@@ -99,7 +99,10 @@ public:
 	{ 
 		std::set<OwnedGroup>::iterator it=IFind(grpId);
 		if (it != fGroups.end())
-			(*it).fOwnIt=ownIt;
+		{
+			fGroups.erase(it);
+			fGroups.insert(OwnedGroup(grpId, ownIt));
+		}
 		else
 		{
 			ISetGroupDesc(grpId);

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp

@@ -275,7 +275,7 @@ void plNetObjectDebugger::LogMsgIfMatch(const char* msg) const
 	std::string tmp = msg;
 	hsStrLower((char*)tmp.c_str());
 	std::string objTag="object";
-	char* c=strstr(tmp.c_str(), objTag.c_str());
+	const char* c=strstr(tmp.c_str(), objTag.c_str());
 	if (c && c != tmp.c_str())
 	{
 		c+=objTag.size();

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp

@@ -82,7 +82,7 @@ void plNetClientRecorder::IMakeFilename(const char* recName, char* path)
 	CreateDirectory(path, NULL);
 #endif
 
-	char* lastDot = strrchr(recName, '.');
+	const char* lastDot = strrchr(recName, '.');
 	if (lastDot)
 		strncat(path, recName, lastDot-recName);
 	else

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.cpp

@@ -84,7 +84,7 @@ void plPhysicsSoundMgr::Update()
 	fCurCollisions.clear();
 }
 
-void plPhysicsSoundMgr::IStartCollision(CollidePair& cp)
+void plPhysicsSoundMgr::IStartCollision(const CollidePair& cp)
 {
 	hsVector3 v1, v2;
 	const hsScalar strengthThreshold = 20.0f;
@@ -120,7 +120,7 @@ void plPhysicsSoundMgr::IStartCollision(CollidePair& cp)
 	}
 }
 
-void plPhysicsSoundMgr::IStopCollision(CollidePair& cp)
+void plPhysicsSoundMgr::IStopCollision(const CollidePair& cp)
 {
 	plPhysical* physicalA = cp.FirstPhysical();
 	plPhysical* physicalB = cp.SecondPhysical();
@@ -146,7 +146,7 @@ void plPhysicsSoundMgr::IStopCollision(CollidePair& cp)
 	}
 }
 
-void plPhysicsSoundMgr::IUpdateCollision(CollidePair& cp)
+void plPhysicsSoundMgr::IUpdateCollision(const CollidePair& cp)
 {
 	const hsScalar slideThreshhold = 0.f;	
 	hsVector3 v1, v2;

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h

@@ -81,9 +81,9 @@ private:
 		plPhysical* SecondPhysical() const;
 	};
 
-	void IStartCollision(CollidePair& cp);
+	void IStartCollision(const CollidePair& cp);
-	void IStopCollision(CollidePair& cp);
+	void IStopCollision(const CollidePair& cp);
-	void IUpdateCollision(CollidePair& cp);
+	void IUpdateCollision(const CollidePair& cp);
 	void IProcessSlide(plPhysicalSndGroup* sndA, plPhysicalSndGroup* sndB, hsScalar strength);
 	
 	typedef std::set<CollidePair> CollideSet;

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

@@ -10575,7 +10575,7 @@ inline void inlTESTPOINT(const hsPoint3& destP,
 
 void	plDXPipeline::IBlendVertsIntoBuffer( plSpan* span, 
 											  hsMatrix44* matrixPalette, int numMatrices,
-											  UInt8 *src, UInt8 format, UInt32 srcStride, 
+											  const UInt8 *src, UInt8 format, UInt32 srcStride, 
 											  UInt8 *dest, UInt32 destStride, UInt32 count,
 											  UInt16 localUVWChans )
 {

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h

@@ -464,7 +464,7 @@ protected:
 	hsBool			IAvatarSort(plDrawableSpans* d, const hsTArray<Int16>& visList);
 	void			IBlendVertsIntoBuffer( plSpan* span, 
 											hsMatrix44* matrixPalette, int numMatrices,
-											UInt8 *src, UInt8 format, UInt32 srcStride, 
+											const UInt8 *src, UInt8 format, UInt32 srcStride, 
 											UInt8 *dest, UInt32 destStride, UInt32 count, UInt16 localUVWChans );
 	hsBool			ISoftwareVertexBlend( plDrawableSpans* drawable, const hsTArray<Int16>& visList );