From 46c4a457e08d6ce9f469bad1121d2b3beabc0473 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 24 Jul 2011 15:26:58 -0700 Subject: [PATCH] Syntax fixes for PubUtilLib. --- Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h | 6 +++--- Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h | 4 ++-- Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h | 4 ++-- Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h | 8 ++++---- Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h | 4 ++-- Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h | 2 -- Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp | 2 +- Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp | 8 ++++---- Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h | 5 +++-- Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp | 4 ++-- Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h | 2 +- .../PubUtilLib/plInputCore/plAvatarInputInterface.h | 2 +- Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h | 2 +- Sources/Plasma/PubUtilLib/plMath/plAvg.cpp | 2 +- Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h | 2 +- Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h | 2 +- Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h | 2 +- Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h | 2 +- .../Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h | 2 +- .../PubUtilLib/plParticleSystem/plParticleEmitter.h | 4 ++-- .../Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h | 4 ++-- .../PubUtilLib/plPhysX/plPXPhysicalControllerCore.h | 8 ++++---- .../Plasma/PubUtilLib/plPhysical/plCollisionDetector.h | 2 +- Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h | 2 +- Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h | 2 +- Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h | 2 +- Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h | 4 ++-- Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h | 2 +- Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h | 4 ++-- Sources/Plasma/PubUtilLib/plSockets/plNet.h | 2 +- Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h | 2 +- Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h | 2 +- Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp | 2 +- 39 files changed, 59 insertions(+), 60 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h index 0e60102d..08cf44cf 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h @@ -148,7 +148,7 @@ class plEAXSourceSettings protected: friend class plEAXSource; - friend plEAXSourceSoftSettings; + friend class plEAXSourceSoftSettings; hsBool fEnabled; Int16 fRoom, fRoomHF; @@ -176,8 +176,8 @@ class plEAXSourceSettings class plEAXSource { public: - friend plEAXSourceSettings; - friend plEAXSourceSoftSettings; + friend class plEAXSourceSettings; + friend class plEAXSourceSoftSettings; plEAXSource(); virtual ~plEAXSource(); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h index 1002bee8..275f0a8a 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h @@ -179,4 +179,4 @@ protected: }; -#endif PLAGCHANNEL_H +#endif //PLAGCHANNEL_H diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h index 4747e4c0..641e0d88 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h @@ -188,7 +188,7 @@ public: virtual void AddTarget(plSceneObject * object); virtual void RemoveTarget(plSceneObject * object); - hsBool plAGMasterMod::MsgReceive(plMessage* msg); + hsBool MsgReceive(plMessage* msg); virtual void Write(hsStream *stream, hsResMgr *mgr); virtual void Read(hsStream * stream, hsResMgr *mgr); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h index 974c3cc6..0c481880 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h @@ -281,7 +281,7 @@ public: kSwim, }; - const char *plArmatureMod::GetAnimRootName(const char *name); + const char *GetAnimRootName(const char *name); Int8 AnimNameToIndex(const char *name); void SetBodyType(int type) { fBodyType = type; } int GetBodyType(int type) { return fBodyType; } @@ -466,4 +466,4 @@ protected: #define TWO_PI (hsScalarPI * 2) -#endif plArmatureMod_inc +#endif //plArmatureMod_inc diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h index 84206916..79f6398c 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h @@ -88,8 +88,8 @@ public: virtual void LoadFromSDL(const plStateDataRecord *sdl); void DumpToDebugDisplay(int &x, int &y, int lineHeight, char *strBuf, plDebugText &debugTxt); - const char * plAvBrainClimb::WorldDirStr(plClimbMsg::Direction dir); - const char *plAvBrainClimb::ModeStr(Mode mode); + const char * WorldDirStr(plClimbMsg::Direction dir); + const char *ModeStr(Mode mode); // plasma protocol virtual hsBool MsgReceive(plMessage *msg); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h index a00b9a12..9c3b695b 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h @@ -240,7 +240,7 @@ public: virtual void DumpToDebugDisplay(int &x, int &y, int lineHeight, char *strBuf, plDebugText &debugTxt); // plasma protocol - hsBool plAvBrainGeneric::MsgReceive(plMessage *msg); + hsBool MsgReceive(plMessage *msg); CLASSNAME_REGISTER( plAvBrainGeneric ); GETINTERFACE_ANY( plAvBrainGeneric, plArmatureBrain ); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h index b4476446..45994484 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h @@ -105,4 +105,4 @@ protected: }; }; -#endif PL_AV_BRAIN_SWIM_H +#endif //PL_AV_BRAIN_SWIM_H diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h index 5828b190..25f74e6d 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h @@ -164,11 +164,11 @@ protected: /** Handle an incoming clone message; do any necessary post-processing on the avatar. */ - void plAvatarMgr::IFinishLoadingAvatar(plLoadAvatarMsg *cloneMsg); + void IFinishLoadingAvatar(plLoadAvatarMsg *cloneMsg); /** Handle an incoming clone message which holds an unload request. */ - void plAvatarMgr::IFinishUnloadingAvatar(plLoadAvatarMsg *cloneMsg); + void IFinishUnloadingAvatar(plLoadAvatarMsg *cloneMsg); /** When an armature modifier attached to the given scene object is loaded, send it the given message. @@ -177,10 +177,10 @@ protected: We'll get that notification via the AddAvatar call later. In this function we're going to squirrel away an initialization message to pass to the armature modifier when it arrives. */ - void plAvatarMgr::IDeferInit(plKey playerSOKey, plMessage *initMsg); + void IDeferInit(plKey playerSOKey, plMessage *initMsg); /** See if we have an avatar type message saved for the given avatar and send them. */ - void plAvatarMgr::ISendDeferredInit(plKey playerSOKey); + void ISendDeferredInit(plKey playerSOKey); static plAvatarMgr* fInstance; // the single instance of the avatar manager diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h index eef4ab7e..50070fb3 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h @@ -174,7 +174,7 @@ public: \param brain The brain to attach the task to. */ plAvOneShotTask (plAvOneShotMsg *msg, plArmatureMod *avatar, plArmatureBrain *brain); - virtual plAvOneShotTask::~plAvOneShotTask(); + virtual ~plAvOneShotTask(); // task protocol virtual hsBool Start(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h index ea7af3cc..a9620634 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h @@ -154,7 +154,7 @@ public: plMatrixBlend(plMatrixChannel * channelA, plMatrixChannel * channelB, plScalarChannel * channelBias, int priority); virtual ~plMatrixBlend(); - virtual plAGChannel * plMatrixBlend::MakeBlend(plAGChannel *newChannel, plScalarChannel *channelBias, int blendPriority); + virtual plAGChannel * MakeBlend(plAGChannel *newChannel, plScalarChannel *channelBias, int blendPriority); // you cannot blend on top of a channel that has higher priority than you do. virtual UInt16 GetPriority(); @@ -182,7 +182,7 @@ public: virtual plAGChannel * Detach(plAGChannel * channel); virtual void Dump(int indent, bool optimized, double time); - plAGChannel *plMatrixBlend::Optimize(double time); + plAGChannel* Optimize(double time); // PLASMA PROTOCOL CLASSNAME_REGISTER( plMatrixBlend ); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h b/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h index 7b1eeca1..8a225450 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h @@ -192,7 +192,7 @@ public: virtual const hsScalar & Value(double time, hsBool peek = false); virtual const hsScalar & Value(double time, hsBool peek, plControllerCacheInfo *cache); - virtual plAGChannel *plScalarControllerChannel::MakeCacheChannel(plAnimTimeConvert *atc); + virtual plAGChannel *MakeCacheChannel(plAnimTimeConvert *atc); // PLASMA PROTOCOL // rtti diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h b/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h index b7cdaab8..3bd99a87 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h @@ -46,8 +46,6 @@ class plAccessGeometry : public hsRefCnt protected: void Nilify() { fPipe = nil; } - friend class plAccessGeometry; - plPipeline* fPipe; static plAccessGeometry* fInstance; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp index e23e4858..ad1890ce 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp @@ -2785,7 +2785,7 @@ void plDrawableSpans::RemoveDISpans( UInt32 index ) } } } -#else MF_RENDDEP +#else // MF_RENDDEP spanInverseTable[(*spanIndices)[i]] = -1; for( j = (*spanIndices)[i]; j < fSpans.GetCount(); j++ ) spanInverseTable[j]--; diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp index 9d126db0..cfbb6a0a 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp @@ -89,7 +89,7 @@ hsBool plDynaSplot::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life) while( n-- ) { hsScalar initOpac = *sPtr; - *alpha = unsigned char(initOpac * atten * 255.99f); + *alpha = (unsigned char)(initOpac * atten * 255.99f); alpha += stride; sPtr += 3; @@ -166,7 +166,7 @@ hsBool plDynaRipple::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life) while( n-- ) { unsigned char* alpha = ((unsigned char*)&vtx->fDiffuse) + 3; - *alpha = unsigned char(origUVW->fZ * atten * 255.99f); + *alpha = (unsigned char)(origUVW->fZ * atten * 255.99f); vtx->fUVW[0].fX = (origUVW->fX - 0.5f) * scaleU + 0.5f; vtx->fUVW[0].fY = (origUVW->fY - 0.5f) * scaleV + 0.5f; @@ -246,7 +246,7 @@ hsBool plDynaWake::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life) while( n-- ) { unsigned char* alpha = ((unsigned char*)&vtx->fDiffuse) + 3; - *alpha = unsigned char(origUVW->fZ * atten * 255.99f); + *alpha = (unsigned char)(origUVW->fZ * atten * 255.99f); vtx->fUVW[0].fX = (origUVW->fX - 0.5f) * scaleU + 0.5f; vtx->fUVW[0].fY = origUVW->fY * scaleV; @@ -326,7 +326,7 @@ hsBool plDynaWave::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life) while( n-- ) { unsigned char* alpha = ((unsigned char*)&vtx->fDiffuse) + 3; - *alpha = unsigned char(origUVW->fZ * atten * 255.99f); + *alpha = (unsigned char)(origUVW->fZ * atten * 255.99f); vtx->fUVW[0].fX = origUVW->fX; vtx->fUVW[0].fY = origUVW->fY * scale + scroll; diff --git a/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h b/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h index ed6f929e..e1f86a76 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h +++ b/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h @@ -32,11 +32,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com class plLODMipmap : public plMipmap { protected: - const enum + enum { kRefBase = 0 }; - const enum + + enum { kNumLODs = 5 }; diff --git a/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp b/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp index b3114c38..2a3c11dd 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp @@ -383,7 +383,7 @@ plMipmap *plMipmap::ISplitAlpha() switch( fUncompressedInfo.fType ) { - case fUncompressedInfo.kRGB8888: + case UncompressedInfo::kRGB8888: // first byte is the alpha channel, we will drop this byte into the red channel for compression while (curByte < numBytes) { @@ -411,7 +411,7 @@ void plMipmap::IRecombineAlpha( plMipmap *alphaChannel ) switch( fUncompressedInfo.fType ) { - case fUncompressedInfo.kRGB8888: + case UncompressedInfo::kRGB8888: // first byte is the alpha channel, we will grab this byte from the red channel for reconstitution while (curByte < numBytes) { diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h b/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h index 1f122734..ab4225d9 100644 --- a/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h +++ b/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h @@ -79,7 +79,7 @@ protected: hsScalar fMaxOpacity; hsTArray fSpans; - friend plShadowMaster; + friend class plShadowMaster; void ICollectAllSpans(); diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h index 17995759..b848bab4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h +++ b/Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h @@ -249,4 +249,4 @@ class plAvatarInputInterface : public plInputInterface -#endif plAvatarInputInterface_inc +#endif //plAvatarInputInterface_inc diff --git a/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h b/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h index f131ea81..d9394ee9 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h @@ -169,4 +169,4 @@ public: virtual void Write(hsStream* s, hsResMgr* mgr); }; -#endif plAnimPath_inc +#endif //plAnimPath_inc diff --git a/Sources/Plasma/PubUtilLib/plMath/plAvg.cpp b/Sources/Plasma/PubUtilLib/plMath/plAvg.cpp index 41e3a9da..13761b06 100644 --- a/Sources/Plasma/PubUtilLib/plMath/plAvg.cpp +++ b/Sources/Plasma/PubUtilLib/plMath/plAvg.cpp @@ -68,7 +68,7 @@ void TimeBasedAvgRing::AddItem(T value, double time) // remove RingStart from the avg part of the average calc fTotal -= (*fRingStart).GetValue(); - TimeList::iterator prev = fRingStart++; + typename TimeList::iterator prev = fRingStart++; // loop the ring if needed if (fRingStart == fList.end()) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h index 547810c1..795f7484 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h @@ -301,7 +301,7 @@ public: \param stage Which stage are we setting the loop count for? \param newLoopCount The loop count we are setting on the stage */ - plAvBrainGenericMsg::plAvBrainGenericMsg(plKey sender, plKey receiver, + plAvBrainGenericMsg(plKey sender, plKey receiver, Type type, int stage, int newLoopCount); // plasma protocol CLASSNAME_REGISTER( plAvBrainGenericMsg ); diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h index 048b7013..7e5f3281 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h @@ -38,7 +38,7 @@ class plCondRefMsg : public plRefMsg public: plCondRefMsg() { fWhich = -1; } - plCondRefMsg::plCondRefMsg(const plKey &s, int which) + plCondRefMsg(const plKey &s, int which) : plRefMsg(s, plRefMsg::kOnCreate), fWhich(which) {} CLASSNAME_REGISTER( plCondRefMsg ); diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h index 48683b12..93e71996 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h @@ -51,4 +51,4 @@ public: }; -#endif plMatrixUpdateMsg_inc +#endif //plMatrixUpdateMsg_inc diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index 6f73f4da..ffd426aa 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -344,7 +344,7 @@ public: const plKey& GetAgeSDLObjectKey() const { return fAgeSDLObjectKey; } plUoid GetAgeSDLObjectUoid(const char* ageName) const; plNetClientComm& GetNetClientComm() { return fNetClientComm; } - const char* plNetClientMgr::GetNextAgeFilename(); + const char* GetNextAgeFilename(); plNetClientStats& GetNetClientStats() { return fNetClientStats; } void SetOverrideAgeTimeOfDayPercent(float f) { fOverrideAgeTimeOfDayPercent=f; } diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h index 110c3f38..166642bd 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h @@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef SERVER class plNetCoreStatsSummary : public plCreatable { - static const UInt8 plNetCoreStatsSummary::StreamVersion; + static const UInt8 StreamVersion; float fULBitsPS; float fDLBitsPS; float fULPeakBitsPS; diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h index ecdaa368..6c65ce75 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h @@ -45,8 +45,8 @@ class hsResMgr; class plParticleEmitter : public plCreatable { - friend plParticleSystem; - friend plSimpleParticleGenerator; + friend class plParticleSystem; + friend class plSimpleParticleGenerator; public: plParticleEmitter(); diff --git a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h index f69be40d..db0218a6 100644 --- a/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h +++ b/Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h @@ -52,8 +52,8 @@ class Mtl; class plParticleSystem : public plModifier { - friend plParticleEmitter; - friend plSimpleParticleGenerator; + friend class plParticleEmitter; + friend class plSimpleParticleGenerator; protected: static const hsScalar GRAVITY_ACCEL_FEET_PER_SEC2; diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h index b601655d..2748b9b7 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h @@ -50,7 +50,7 @@ public: #endif // PLASMA_EXTERNAL_RELEASE class plPXPhysicalControllerCore: public plPhysicalControllerCore { - friend PXControllerHitReportWalk; + friend class PXControllerHitReportWalk; public: plPXPhysicalControllerCore(plKey ownerSO, hsScalar height, hsScalar radius); ~plPXPhysicalControllerCore(); @@ -104,7 +104,7 @@ public: #ifndef PLASMA_EXTERNAL_RELEASE static hsBool fDebugDisplay; #endif // PLASMA_EXTERNAL_RELEASE - static void plPXPhysicalControllerCore::SetMaxNumberOfControllers(int max) { fPXControllersMax = max; } + static void SetMaxNumberOfControllers(int max) { fPXControllersMax = max; } static int fPXControllersMax; virtual int SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, hsBool vsDynamics, hsBool vsStatics, UInt32& vsSimGroups, std::multiset< plControllerSweepRecord >& WhatWasHitOut); virtual void BehaveLikeAnimatedPhysical(hsBool actLikeAnAnimatedPhys); @@ -127,14 +127,14 @@ protected: void ICreateController(); void IDeleteController(); void IInformDetectors(bool entering,bool deferUntilNextSim); - void plPXPhysicalControllerCore::ICreateController(const hsPoint3& pos); + void ICreateController(const hsPoint3& pos); NxActor* fKinematicActor; NxCapsuleController* fController; #ifndef PLASMA_EXTERNAL_RELEASE hsTArray fDbgCollisionInfo; void IDrawDebugDisplay(); #endif - void plPXPhysicalControllerCore::IHandleResize(); + void IHandleResize(); hsTArray fQueuedCollideMsgs; hsScalar fPreferedRadius; hsScalar fPreferedHeight; diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h index 36eb9aa8..131186f8 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h @@ -287,4 +287,4 @@ public: CLASSNAME_REGISTER( plRidingAnimatedPhysicalDetector ); GETINTERFACE_ANY( plRidingAnimatedPhysicalDetector, plSimpleRegionSensor); }; -#endif plCollisionDetector_inc +#endif //plCollisionDetector_inc diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h b/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h index 3f34ea44..773c1d8c 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h @@ -82,4 +82,4 @@ public: }; -#endif plDetectorModifier_inc +#endif //plDetectorModifier_inc diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h b/Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h index 0be9b4ec..a5468e46 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h @@ -120,4 +120,4 @@ namespace plSimDefs } -#endif PLSIMDEFS_H \ No newline at end of file +#endif //PLSIMDEFS_H diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h index dc43b79f..a0bb9a1e 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h @@ -40,4 +40,4 @@ public: static HMODULE GetD3DDll(); }; -#endif hsGDDrawDllLoad_inc +#endif // hsGDDrawDllLoad_inc diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h index 7181b99e..8fe229fb 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h @@ -523,8 +523,8 @@ protected: void ISetupTransforms(plDrawableSpans* drawable, const plSpan& span, hsMatrix44& lastL2W); // Plate management - friend plDXPlateManager; - friend plBinkPlayer; + friend class plDXPlateManager; + friend class plBinkPlayer; void IDrawPlate( plPlate *plate ); diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h index b6fa64ff..434e2c31 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h @@ -51,7 +51,7 @@ class plCubicRenderTarget; class plRenderTarget : public plBitmap { - friend plCubicRenderTarget; + friend class plCubicRenderTarget; protected: diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h index 888c8f5b..5a516cfe 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h @@ -43,7 +43,7 @@ public: kNumLanguages, }; - typedef enum encodingTypes + enum encodingTypes { Enc_Unencoded, // This can also mean that python did the decoding for us and we don't need to tweak it on our end Enc_Split_String, @@ -114,4 +114,4 @@ public: static std::vector StringToLocal(const std::wstring & localizedText); }; -#endif // plLocalization_h_inc \ No newline at end of file +#endif // plLocalization_h_inc diff --git a/Sources/Plasma/PubUtilLib/plSockets/plNet.h b/Sources/Plasma/PubUtilLib/plSockets/plNet.h index 74985054..9cbaa32c 100644 --- a/Sources/Plasma/PubUtilLib/plSockets/plNet.h +++ b/Sources/Plasma/PubUtilLib/plSockets/plNet.h @@ -83,7 +83,7 @@ struct plNet static int Listen(const SOCKET sck, const int qsize); static int Accept(const SOCKET sck, sockaddr_in * addr); static int Ioctl(const SOCKET sck, const long flags, unsigned long * val); - static const char * plNet::GetErrorMsg(int error); + static const char * GetErrorMsg(int error); // TODO: Add get/setsockopt() here ~plNet(); private: diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h b/Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h index b1f5b21d..53e25242 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h @@ -40,4 +40,4 @@ public: }; -#endif plLayerDepth_inc +#endif //plLayerDepth_inc diff --git a/Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h b/Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h index 2eaaf3a2..8c3f17c9 100644 --- a/Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h +++ b/Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h @@ -55,4 +55,4 @@ class plLayerOr : public plLayerInterface virtual UInt32 Eval(double secs, UInt32 frame, UInt32 ignore); }; -#endif _plLayerOr_h +#endif //_plLayerOr_h diff --git a/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp b/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp index ccb4f470..e029ddf8 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp +++ b/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp @@ -3447,7 +3447,7 @@ void VaultAddChronicleEntry (const wchar entryName[], int entryType, const wchar } void _VaultAddChronicleEntryCB(ENetError result, void* state, void * param, RelVaultNode* node) { - if (result == ENetError::kNetSuccess) { + if (result == kNetSuccess) { RelVaultNode* rvnFldr = GetChildFolderNode(GetPlayerNode(), plVault::kChronicleFolder, 1); if (rvnFldr != nil) VaultAddChildNode(rvnFldr->nodeId, node->nodeId, 0, nil, nil);