OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Minor adjustments to avoid needless trivial differences to H-uru/Plasma.

Browse Source
This commit is contained in:
Christian Walther
2012-05-01 11:17:52 +02:00
parent f5d00acdc5
commit b2f8d8c0f0
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
View File

@ -64,7 +64,7 @@ struct Factory : THashKeyVal<Uuid> {
const GameTypeReg & reg; const GameTypeReg & reg;
Factory (const GameTypeReg & reg); Factory (const GameTypeReg & reg);
Factory & operator= (const Factory &); // not impl Factory& operator= (const Factory &); // not impl
}; };
//============================================================================ //============================================================================

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
View File

@ -162,12 +162,12 @@ bool GuidIsNil (const Uuid & uuid) {
const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) { const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) {
wchar * src; wchar * src;
RPC_STATUS s; RPC_STATUS s;
s = UuidToStringW( (GUID *) &uuid, (unsigned short **)&src ); s = UuidToStringW( (GUID *) &uuid, (unsigned short**)&src );
if (RPC_S_OK == s) if (RPC_S_OK == s)
StrCopy(dst, src, chars); StrCopy(dst, src, chars);
else else
StrCopy(dst, L"", chars); StrCopy(dst, L"", chars);
RpcStringFreeW((unsigned short **)&src); RpcStringFreeW( (unsigned short**)&src );
return dst; return dst;
} }

12
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp
View File

@ -337,8 +337,8 @@ void BigNum::DivNormalized (const BigNum & a, const BigNum & b, BigNum * remaind
if (quotient) { if (quotient) {
Val borrow = 0; Val borrow = 0;
Val carry = 0; Val carry = 0;
unsigned denomIndex = 0; unsigned denomIndex;
for (; denomIndex != denomCount; ++denomIndex) { for (denomIndex = 0; denomIndex != denomCount; ++denomIndex) {
DVal product = (DVal)(Mul((*denom)[denomIndex], quotient) + carry); DVal product = (DVal)(Mul((*denom)[denomIndex], quotient) + carry);
carry = HIGH(product); carry = HIGH(product);
numer->SetVal(quotientIndex + denomIndex, (DVal)((DVal)(*numer)[quotientIndex + denomIndex] - (DVal)LOW(product) - (DVal)borrow), &borrow); 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(); const unsigned count = a.Count();
SetCount(count); SetCount(count);
Val borrow = b; Val borrow = b;
unsigned index = 0; unsigned index;
for (; index < count; ++index) { for (index = 0; index < count; ++index) {
SetVal(index, (DVal)((DVal)a[index] - (DVal)borrow), &borrow); SetVal(index, (DVal)((DVal)a[index] - (DVal)borrow), &borrow);
borrow = (Val)((Val)0 - (Val)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(); const unsigned bCount = b.Count();
GrowToCount(count, true); GrowToCount(count, true);
Val borrow = 0; Val borrow = 0;
unsigned index = 0; unsigned index;
for (; index < count; ++index) { for (index = 0; index < count; ++index) {
Val bVal = (index < bCount) ? b[index] : (Val)0; Val bVal = (index < bCount) ? b[index] : (Val)0;
SetVal(index, (DVal)((DVal)a[index] - (DVal)bVal - (DVal)borrow), &borrow); SetVal(index, (DVal)((DVal)a[index] - (DVal)bVal - (DVal)borrow), &borrow);
borrow = (Val)((Val)0 - (Val)borrow); borrow = (Val)((Val)0 - (Val)borrow);

5
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h
View File

@ -151,8 +151,6 @@ public:
virtual void Read(hsStream *s, hsResMgr *mgr); virtual void Read(hsStream *s, hsResMgr *mgr);
protected: protected:
friend class plAGModifier;
// -- methods -- // -- methods --
virtual void IApply(const plAGModifier *mod, double time) = 0; virtual void IApply(const plAGModifier *mod, double time) = 0;
@ -163,6 +161,9 @@ protected:
plSimulationInterface * IGetSI(const plAGModifier *modifier) const; plSimulationInterface * IGetSI(const plAGModifier *modifier) const;
plObjInterface * IGetGI(const plAGModifier *modifier, UInt16 classIdx) const; plObjInterface * IGetGI(const plAGModifier *modifier, UInt16 classIdx) const;
// Allow plAGModifier to declare IGet?? as friends
friend class plAGModifier;
// -- members -- // -- members --
plAGChannel *fChannel; plAGChannel *fChannel;
hsBool fEnabled; hsBool fEnabled;

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
View File

@ -100,8 +100,9 @@ public:
std::set<OwnedGroup>::iterator it=IFind(grpId); std::set<OwnedGroup>::iterator it=IFind(grpId);
if (it != fGroups.end()) if (it != fGroups.end())
{ {
OwnedGroup grp(it->fGroup, it->fOwnIt);
fGroups.erase(it); fGroups.erase(it);
fGroups.insert(OwnedGroup(grpId, ownIt)); fGroups.insert(grp);
} }
else else
{ {