From b2f8d8c0f0104cfa9ac77cc441449e70cbe34b21 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Tue, 1 May 2012 11:17:52 +0200
Subject: [PATCH] Minor adjustments to avoid needless trivial differences to
 H-uru/Plasma.

---
 .../Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp        |  2 +-
 .../NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp |  4 ++--
 .../Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp | 12 ++++++------
 .../Plasma/PubUtilLib/plAvatar/plAGApplicator.h      |  5 +++--
 .../Plasma/PubUtilLib/plNetClient/plNetClientGroup.h |  3 ++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
index 087b4d23..102e498f 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
@@ -64,7 +64,7 @@ struct Factory : THashKeyVal<Uuid> {
 	const GameTypeReg &	reg;
 
 	Factory (const GameTypeReg & reg);
-	Factory & operator= (const Factory &);	// not impl
+	Factory& operator= (const Factory &);	// not impl
 };
 
 //============================================================================
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
index a586ae1d..b02e92c7 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
@@ -162,12 +162,12 @@ bool GuidIsNil (const Uuid & uuid) {
 const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) {
 	wchar * src;
 	RPC_STATUS s;
-	s = UuidToStringW( (GUID *) &uuid, (unsigned short **)&src );
+	s = UuidToStringW( (GUID *) &uuid, (unsigned short**)&src );
 	if (RPC_S_OK == s)
         StrCopy(dst, src, chars);
     else
         StrCopy(dst, L"", chars);
-	RpcStringFreeW((unsigned short **)&src);
+	RpcStringFreeW( (unsigned short**)&src );
     return dst;
 }
 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
index c81c7e7c..1d7dd1b4 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
@@ -337,8 +337,8 @@ void BigNum::DivNormalized (const BigNum & a, const BigNum & b, BigNum * remaind
         if (quotient) {
             Val borrow = 0;
             Val carry  = 0;
-            unsigned denomIndex = 0;
-            for (; denomIndex != denomCount; ++denomIndex) {
+            unsigned denomIndex;
+            for (denomIndex = 0; denomIndex != denomCount; ++denomIndex) {
                 DVal product = (DVal)(Mul((*denom)[denomIndex], quotient) + carry);
                 carry = HIGH(product);
                 numer->SetVal(quotientIndex + denomIndex, (DVal)((DVal)(*numer)[quotientIndex + denomIndex] - (DVal)LOW(product) - (DVal)borrow), &borrow);
@@ -1314,8 +1314,8 @@ void BigNum::Sub (const BigNum & a, Val b) {
     const unsigned count = a.Count();
     SetCount(count);
     Val borrow = b;
-    unsigned index = 0;
-    for (; index < count; ++index) {
+    unsigned index;
+    for (index = 0; index < count; ++index) {
         SetVal(index, (DVal)((DVal)a[index] - (DVal)borrow), &borrow);
         borrow = (Val)((Val)0 - (Val)borrow);
     }
@@ -1332,8 +1332,8 @@ void BigNum::Sub (const BigNum & a, const BigNum & b) {
     const unsigned bCount = b.Count();
     GrowToCount(count, true);
     Val borrow = 0;
-    unsigned index = 0;
-    for (; index < count; ++index) {
+    unsigned index;
+    for (index = 0; index < count; ++index) {
         Val bVal = (index < bCount) ? b[index] : (Val)0;
         SetVal(index, (DVal)((DVal)a[index] - (DVal)bVal - (DVal)borrow), &borrow);
         borrow = (Val)((Val)0 - (Val)borrow);
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h
index 09d9bf57..708b7e04 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h
@@ -151,8 +151,6 @@ public:
 	virtual void Read(hsStream *s, hsResMgr *mgr);
 
 protected:
-	friend class plAGModifier;
-
 	// -- methods --
 	virtual void IApply(const plAGModifier *mod, double time) = 0;
 
@@ -163,6 +161,9 @@ protected:
 	plSimulationInterface * IGetSI(const plAGModifier *modifier) const;
 	plObjInterface * IGetGI(const plAGModifier *modifier, UInt16 classIdx) const;
 
+	// Allow plAGModifier to declare IGet?? as friends
+	friend class plAGModifier;
+
 	// -- members --
 	plAGChannel *fChannel;
 	hsBool fEnabled;
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
index 31ac859e..db5ed77e 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
@@ -100,8 +100,9 @@ public:
 		std::set<OwnedGroup>::iterator it=IFind(grpId);
 		if (it != fGroups.end())
 		{
+			OwnedGroup grp(it->fGroup, it->fOwnIt);
 			fGroups.erase(it);
-			fGroups.insert(OwnedGroup(grpId, ownIt));
+			fGroups.insert(grp);
 		}
 		else
 		{