Browse Source

Syntax fixes for PubUtilLib.

Darryl Pogue 14 years ago
parent
commit
46c4a457e0
  1. 6
      Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h
  2. 2
      Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h
  3. 2
      Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h
  4. 4
      Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h
  5. 4
      Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h
  6. 2
      Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h
  7. 2
      Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h
  8. 8
      Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h
  9. 2
      Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h
  10. 4
      Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h
  11. 2
      Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h
  12. 2
      Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h
  13. 2
      Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp
  14. 8
      Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp
  15. 5
      Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h
  16. 4
      Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
  17. 2
      Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h
  18. 2
      Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h
  19. 2
      Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h
  20. 2
      Sources/Plasma/PubUtilLib/plMath/plAvg.cpp
  21. 2
      Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h
  22. 2
      Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h
  23. 2
      Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h
  24. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
  25. 2
      Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h
  26. 4
      Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h
  27. 4
      Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h
  28. 8
      Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h
  29. 2
      Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h
  30. 2
      Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h
  31. 2
      Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h
  32. 2
      Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h
  33. 4
      Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h
  34. 2
      Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h
  35. 4
      Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h
  36. 2
      Sources/Plasma/PubUtilLib/plSockets/plNet.h
  37. 2
      Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h
  38. 2
      Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h
  39. 2
      Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp

6
Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.h

@ -148,7 +148,7 @@ class plEAXSourceSettings
protected: protected:
friend class plEAXSource; friend class plEAXSource;
friend plEAXSourceSoftSettings; friend class plEAXSourceSoftSettings;
hsBool fEnabled; hsBool fEnabled;
Int16 fRoom, fRoomHF; Int16 fRoom, fRoomHF;
@ -176,8 +176,8 @@ class plEAXSourceSettings
class plEAXSource class plEAXSource
{ {
public: public:
friend plEAXSourceSettings; friend class plEAXSourceSettings;
friend plEAXSourceSoftSettings; friend class plEAXSourceSoftSettings;
plEAXSource(); plEAXSource();
virtual ~plEAXSource(); virtual ~plEAXSource();

2
Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.h

@ -179,4 +179,4 @@ protected:
}; };
#endif PLAGCHANNEL_H #endif //PLAGCHANNEL_H

2
Sources/Plasma/PubUtilLib/plAvatar/plAGMasterMod.h

@ -188,7 +188,7 @@ public:
virtual void AddTarget(plSceneObject * object); virtual void AddTarget(plSceneObject * object);
virtual void RemoveTarget(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 Write(hsStream *stream, hsResMgr *mgr);
virtual void Read(hsStream * stream, hsResMgr *mgr); virtual void Read(hsStream * stream, hsResMgr *mgr);

4
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h

@ -281,7 +281,7 @@ public:
kSwim, kSwim,
}; };
const char *plArmatureMod::GetAnimRootName(const char *name); const char *GetAnimRootName(const char *name);
Int8 AnimNameToIndex(const char *name); Int8 AnimNameToIndex(const char *name);
void SetBodyType(int type) { fBodyType = type; } void SetBodyType(int type) { fBodyType = type; }
int GetBodyType(int type) { return fBodyType; } int GetBodyType(int type) { return fBodyType; }
@ -466,4 +466,4 @@ protected:
#define TWO_PI (hsScalarPI * 2) #define TWO_PI (hsScalarPI * 2)
#endif plArmatureMod_inc #endif //plArmatureMod_inc

4
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainClimb.h

@ -88,8 +88,8 @@ public:
virtual void LoadFromSDL(const plStateDataRecord *sdl); virtual void LoadFromSDL(const plStateDataRecord *sdl);
void DumpToDebugDisplay(int &x, int &y, int lineHeight, char *strBuf, plDebugText &debugTxt); void DumpToDebugDisplay(int &x, int &y, int lineHeight, char *strBuf, plDebugText &debugTxt);
const char * plAvBrainClimb::WorldDirStr(plClimbMsg::Direction dir); const char * WorldDirStr(plClimbMsg::Direction dir);
const char *plAvBrainClimb::ModeStr(Mode mode); const char *ModeStr(Mode mode);
// plasma protocol // plasma protocol
virtual hsBool MsgReceive(plMessage *msg); virtual hsBool MsgReceive(plMessage *msg);

2
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainGeneric.h

@ -240,7 +240,7 @@ public:
virtual void DumpToDebugDisplay(int &x, int &y, int lineHeight, char *strBuf, plDebugText &debugTxt); virtual void DumpToDebugDisplay(int &x, int &y, int lineHeight, char *strBuf, plDebugText &debugTxt);
// plasma protocol // plasma protocol
hsBool plAvBrainGeneric::MsgReceive(plMessage *msg); hsBool MsgReceive(plMessage *msg);
CLASSNAME_REGISTER( plAvBrainGeneric ); CLASSNAME_REGISTER( plAvBrainGeneric );
GETINTERFACE_ANY( plAvBrainGeneric, plArmatureBrain ); GETINTERFACE_ANY( plAvBrainGeneric, plArmatureBrain );

2
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.h

@ -105,4 +105,4 @@ protected:
}; };
}; };
#endif PL_AV_BRAIN_SWIM_H #endif //PL_AV_BRAIN_SWIM_H

8
Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h

@ -164,11 +164,11 @@ protected:
/** Handle an incoming clone message; do any necessary post-processing /** Handle an incoming clone message; do any necessary post-processing
on the avatar. */ on the avatar. */
void plAvatarMgr::IFinishLoadingAvatar(plLoadAvatarMsg *cloneMsg); void IFinishLoadingAvatar(plLoadAvatarMsg *cloneMsg);
/** Handle an incoming clone message which holds an unload request. /** 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, /** When an armature modifier attached to the given scene object is loaded,
send it the given message. send it the given message.
@ -177,10 +177,10 @@ protected:
We'll get that notification via the AddAvatar call later. In this function 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 we're going to squirrel away an initialization message to pass to the armature
modifier when it arrives. */ 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. */ /** 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 static plAvatarMgr* fInstance; // the single instance of the avatar manager

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.h

@ -174,7 +174,7 @@ public:
\param brain The brain to attach the task to. \param brain The brain to attach the task to.
*/ */
plAvOneShotTask (plAvOneShotMsg *msg, plArmatureMod *avatar, plArmatureBrain *brain); plAvOneShotTask (plAvOneShotMsg *msg, plArmatureMod *avatar, plArmatureBrain *brain);
virtual plAvOneShotTask::~plAvOneShotTask(); virtual ~plAvOneShotTask();
// task protocol // task protocol
virtual hsBool Start(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed); virtual hsBool Start(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed);

4
Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.h

@ -154,7 +154,7 @@ public:
plMatrixBlend(plMatrixChannel * channelA, plMatrixChannel * channelB, plScalarChannel * channelBias, int priority); plMatrixBlend(plMatrixChannel * channelA, plMatrixChannel * channelB, plScalarChannel * channelBias, int priority);
virtual ~plMatrixBlend(); 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. // you cannot blend on top of a channel that has higher priority than you do.
virtual UInt16 GetPriority(); virtual UInt16 GetPriority();
@ -182,7 +182,7 @@ public:
virtual plAGChannel * Detach(plAGChannel * channel); virtual plAGChannel * Detach(plAGChannel * channel);
virtual void Dump(int indent, bool optimized, double time); virtual void Dump(int indent, bool optimized, double time);
plAGChannel *plMatrixBlend::Optimize(double time); plAGChannel* Optimize(double time);
// PLASMA PROTOCOL // PLASMA PROTOCOL
CLASSNAME_REGISTER( plMatrixBlend ); CLASSNAME_REGISTER( plMatrixBlend );

2
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 = false);
virtual const hsScalar & Value(double time, hsBool peek, plControllerCacheInfo *cache); virtual const hsScalar & Value(double time, hsBool peek, plControllerCacheInfo *cache);
virtual plAGChannel *plScalarControllerChannel::MakeCacheChannel(plAnimTimeConvert *atc); virtual plAGChannel *MakeCacheChannel(plAnimTimeConvert *atc);
// PLASMA PROTOCOL // PLASMA PROTOCOL
// rtti // rtti

2
Sources/Plasma/PubUtilLib/plDrawable/plAccessGeometry.h

@ -46,8 +46,6 @@ class plAccessGeometry : public hsRefCnt
protected: protected:
void Nilify() { fPipe = nil; } void Nilify() { fPipe = nil; }
friend class plAccessGeometry;
plPipeline* fPipe; plPipeline* fPipe;
static plAccessGeometry* fInstance; static plAccessGeometry* fInstance;

2
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; spanInverseTable[(*spanIndices)[i]] = -1;
for( j = (*spanIndices)[i]; j < fSpans.GetCount(); j++ ) for( j = (*spanIndices)[i]; j < fSpans.GetCount(); j++ )
spanInverseTable[j]--; spanInverseTable[j]--;

8
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.cpp

@ -89,7 +89,7 @@ hsBool plDynaSplot::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life)
while( n-- ) while( n-- )
{ {
hsScalar initOpac = *sPtr; hsScalar initOpac = *sPtr;
*alpha = unsigned char(initOpac * atten * 255.99f); *alpha = (unsigned char)(initOpac * atten * 255.99f);
alpha += stride; alpha += stride;
sPtr += 3; sPtr += 3;
@ -166,7 +166,7 @@ hsBool plDynaRipple::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life)
while( n-- ) while( n-- )
{ {
unsigned char* alpha = ((unsigned char*)&vtx->fDiffuse) + 3; 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].fX = (origUVW->fX - 0.5f) * scaleU + 0.5f;
vtx->fUVW[0].fY = (origUVW->fY - 0.5f) * scaleV + 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-- ) while( n-- )
{ {
unsigned char* alpha = ((unsigned char*)&vtx->fDiffuse) + 3; 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].fX = (origUVW->fX - 0.5f) * scaleU + 0.5f;
vtx->fUVW[0].fY = origUVW->fY * scaleV; vtx->fUVW[0].fY = origUVW->fY * scaleV;
@ -326,7 +326,7 @@ hsBool plDynaWave::Age(double t, hsScalar ramp, hsScalar decay, hsScalar life)
while( n-- ) while( n-- )
{ {
unsigned char* alpha = ((unsigned char*)&vtx->fDiffuse) + 3; 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].fX = origUVW->fX;
vtx->fUVW[0].fY = origUVW->fY * scale + scroll; vtx->fUVW[0].fY = origUVW->fY * scale + scroll;

5
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 class plLODMipmap : public plMipmap
{ {
protected: protected:
const enum enum
{ {
kRefBase = 0 kRefBase = 0
}; };
const enum
enum
{ {
kNumLODs = 5 kNumLODs = 5
}; };

4
Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp

@ -383,7 +383,7 @@ plMipmap *plMipmap::ISplitAlpha()
switch( fUncompressedInfo.fType ) 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 // first byte is the alpha channel, we will drop this byte into the red channel for compression
while (curByte < numBytes) while (curByte < numBytes)
{ {
@ -411,7 +411,7 @@ void plMipmap::IRecombineAlpha( plMipmap *alphaChannel )
switch( fUncompressedInfo.fType ) 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 // first byte is the alpha channel, we will grab this byte from the red channel for reconstitution
while (curByte < numBytes) while (curByte < numBytes)
{ {

2
Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h

@ -79,7 +79,7 @@ protected:
hsScalar fMaxOpacity; hsScalar fMaxOpacity;
hsTArray<DrawSpan> fSpans; hsTArray<DrawSpan> fSpans;
friend plShadowMaster; friend class plShadowMaster;
void ICollectAllSpans(); void ICollectAllSpans();

2
Sources/Plasma/PubUtilLib/plInputCore/plAvatarInputInterface.h

@ -249,4 +249,4 @@ class plAvatarInputInterface : public plInputInterface
#endif plAvatarInputInterface_inc #endif //plAvatarInputInterface_inc

2
Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h

@ -169,4 +169,4 @@ public:
virtual void Write(hsStream* s, hsResMgr* mgr); virtual void Write(hsStream* s, hsResMgr* mgr);
}; };
#endif plAnimPath_inc #endif //plAnimPath_inc

2
Sources/Plasma/PubUtilLib/plMath/plAvg.cpp

@ -68,7 +68,7 @@ void TimeBasedAvgRing<T>::AddItem(T value, double time)
// remove RingStart from the avg part of the average calc // remove RingStart from the avg part of the average calc
fTotal -= (*fRingStart).GetValue(); fTotal -= (*fRingStart).GetValue();
TimeList::iterator prev = fRingStart++; typename TimeList::iterator prev = fRingStart++;
// loop the ring if needed // loop the ring if needed
if (fRingStart == fList.end()) if (fRingStart == fList.end())

2
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h

@ -301,7 +301,7 @@ public:
\param stage Which stage are we setting the loop count for? \param stage Which stage are we setting the loop count for?
\param newLoopCount The loop count we are setting on the stage \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); Type type, int stage, int newLoopCount);
// plasma protocol // plasma protocol
CLASSNAME_REGISTER( plAvBrainGenericMsg ); CLASSNAME_REGISTER( plAvBrainGenericMsg );

2
Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h

@ -38,7 +38,7 @@ class plCondRefMsg : public plRefMsg
public: public:
plCondRefMsg() { fWhich = -1; } plCondRefMsg() { fWhich = -1; }
plCondRefMsg::plCondRefMsg(const plKey &s, int which) plCondRefMsg(const plKey &s, int which)
: plRefMsg(s, plRefMsg::kOnCreate), fWhich(which) {} : plRefMsg(s, plRefMsg::kOnCreate), fWhich(which) {}
CLASSNAME_REGISTER( plCondRefMsg ); CLASSNAME_REGISTER( plCondRefMsg );

2
Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h

@ -51,4 +51,4 @@ public:
}; };
#endif plMatrixUpdateMsg_inc #endif //plMatrixUpdateMsg_inc

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h

@ -344,7 +344,7 @@ public:
const plKey& GetAgeSDLObjectKey() const { return fAgeSDLObjectKey; } const plKey& GetAgeSDLObjectKey() const { return fAgeSDLObjectKey; }
plUoid GetAgeSDLObjectUoid(const char* ageName) const; plUoid GetAgeSDLObjectUoid(const char* ageName) const;
plNetClientComm& GetNetClientComm() { return fNetClientComm; } plNetClientComm& GetNetClientComm() { return fNetClientComm; }
const char* plNetClientMgr::GetNextAgeFilename(); const char* GetNextAgeFilename();
plNetClientStats& GetNetClientStats() { return fNetClientStats; } plNetClientStats& GetNetClientStats() { return fNetClientStats; }
void SetOverrideAgeTimeOfDayPercent(float f) { fOverrideAgeTimeOfDayPercent=f; } void SetOverrideAgeTimeOfDayPercent(float f) { fOverrideAgeTimeOfDayPercent=f; }

2
Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h

@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef SERVER #ifndef SERVER
class plNetCoreStatsSummary : public plCreatable class plNetCoreStatsSummary : public plCreatable
{ {
static const UInt8 plNetCoreStatsSummary::StreamVersion; static const UInt8 StreamVersion;
float fULBitsPS; float fULBitsPS;
float fDLBitsPS; float fDLBitsPS;
float fULPeakBitsPS; float fULPeakBitsPS;

4
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.h

@ -45,8 +45,8 @@ class hsResMgr;
class plParticleEmitter : public plCreatable class plParticleEmitter : public plCreatable
{ {
friend plParticleSystem; friend class plParticleSystem;
friend plSimpleParticleGenerator; friend class plSimpleParticleGenerator;
public: public:
plParticleEmitter(); plParticleEmitter();

4
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.h

@ -52,8 +52,8 @@ class Mtl;
class plParticleSystem : public plModifier class plParticleSystem : public plModifier
{ {
friend plParticleEmitter; friend class plParticleEmitter;
friend plSimpleParticleGenerator; friend class plSimpleParticleGenerator;
protected: protected:
static const hsScalar GRAVITY_ACCEL_FEET_PER_SEC2; static const hsScalar GRAVITY_ACCEL_FEET_PER_SEC2;

8
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h

@ -50,7 +50,7 @@ public:
#endif // PLASMA_EXTERNAL_RELEASE #endif // PLASMA_EXTERNAL_RELEASE
class plPXPhysicalControllerCore: public plPhysicalControllerCore class plPXPhysicalControllerCore: public plPhysicalControllerCore
{ {
friend PXControllerHitReportWalk; friend class PXControllerHitReportWalk;
public: public:
plPXPhysicalControllerCore(plKey ownerSO, hsScalar height, hsScalar radius); plPXPhysicalControllerCore(plKey ownerSO, hsScalar height, hsScalar radius);
~plPXPhysicalControllerCore(); ~plPXPhysicalControllerCore();
@ -104,7 +104,7 @@ public:
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
static hsBool fDebugDisplay; static hsBool fDebugDisplay;
#endif // PLASMA_EXTERNAL_RELEASE #endif // PLASMA_EXTERNAL_RELEASE
static void plPXPhysicalControllerCore::SetMaxNumberOfControllers(int max) { fPXControllersMax = max; } static void SetMaxNumberOfControllers(int max) { fPXControllersMax = max; }
static int fPXControllersMax; static int fPXControllersMax;
virtual int SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, hsBool vsDynamics, hsBool vsStatics, UInt32& vsSimGroups, std::multiset< plControllerSweepRecord >& WhatWasHitOut); virtual int SweepControllerPath(const hsPoint3& startPos, const hsPoint3& endPos, hsBool vsDynamics, hsBool vsStatics, UInt32& vsSimGroups, std::multiset< plControllerSweepRecord >& WhatWasHitOut);
virtual void BehaveLikeAnimatedPhysical(hsBool actLikeAnAnimatedPhys); virtual void BehaveLikeAnimatedPhysical(hsBool actLikeAnAnimatedPhys);
@ -127,14 +127,14 @@ protected:
void ICreateController(); void ICreateController();
void IDeleteController(); void IDeleteController();
void IInformDetectors(bool entering,bool deferUntilNextSim); void IInformDetectors(bool entering,bool deferUntilNextSim);
void plPXPhysicalControllerCore::ICreateController(const hsPoint3& pos); void ICreateController(const hsPoint3& pos);
NxActor* fKinematicActor; NxActor* fKinematicActor;
NxCapsuleController* fController; NxCapsuleController* fController;
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
hsTArray<plDbgCollisionInfo> fDbgCollisionInfo; hsTArray<plDbgCollisionInfo> fDbgCollisionInfo;
void IDrawDebugDisplay(); void IDrawDebugDisplay();
#endif #endif
void plPXPhysicalControllerCore::IHandleResize(); void IHandleResize();
hsTArray<plCollideMsg*> fQueuedCollideMsgs; hsTArray<plCollideMsg*> fQueuedCollideMsgs;
hsScalar fPreferedRadius; hsScalar fPreferedRadius;
hsScalar fPreferedHeight; hsScalar fPreferedHeight;

2
Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h

@ -287,4 +287,4 @@ public:
CLASSNAME_REGISTER( plRidingAnimatedPhysicalDetector ); CLASSNAME_REGISTER( plRidingAnimatedPhysicalDetector );
GETINTERFACE_ANY( plRidingAnimatedPhysicalDetector, plSimpleRegionSensor); GETINTERFACE_ANY( plRidingAnimatedPhysicalDetector, plSimpleRegionSensor);
}; };
#endif plCollisionDetector_inc #endif //plCollisionDetector_inc

2
Sources/Plasma/PubUtilLib/plPhysical/plDetectorModifier.h

@ -82,4 +82,4 @@ public:
}; };
#endif plDetectorModifier_inc #endif //plDetectorModifier_inc

2
Sources/Plasma/PubUtilLib/plPhysical/plSimDefs.h

@ -120,4 +120,4 @@ namespace plSimDefs
} }
#endif PLSIMDEFS_H #endif //PLSIMDEFS_H

2
Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h

@ -40,4 +40,4 @@ public:
static HMODULE GetD3DDll(); static HMODULE GetD3DDll();
}; };
#endif hsGDDrawDllLoad_inc #endif // hsGDDrawDllLoad_inc

4
Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h

@ -523,8 +523,8 @@ protected:
void ISetupTransforms(plDrawableSpans* drawable, const plSpan& span, hsMatrix44& lastL2W); void ISetupTransforms(plDrawableSpans* drawable, const plSpan& span, hsMatrix44& lastL2W);
// Plate management // Plate management
friend plDXPlateManager; friend class plDXPlateManager;
friend plBinkPlayer; friend class plBinkPlayer;
void IDrawPlate( plPlate *plate ); void IDrawPlate( plPlate *plate );

2
Sources/Plasma/PubUtilLib/plPipeline/plRenderTarget.h

@ -51,7 +51,7 @@ class plCubicRenderTarget;
class plRenderTarget : public plBitmap class plRenderTarget : public plBitmap
{ {
friend plCubicRenderTarget; friend class plCubicRenderTarget;
protected: protected:

4
Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h

@ -43,7 +43,7 @@ public:
kNumLanguages, 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_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, Enc_Split_String,
@ -114,4 +114,4 @@ public:
static std::vector<std::wstring> StringToLocal(const std::wstring & localizedText); static std::vector<std::wstring> StringToLocal(const std::wstring & localizedText);
}; };
#endif // plLocalization_h_inc #endif // plLocalization_h_inc

2
Sources/Plasma/PubUtilLib/plSockets/plNet.h

@ -83,7 +83,7 @@ struct plNet
static int Listen(const SOCKET sck, const int qsize); static int Listen(const SOCKET sck, const int qsize);
static int Accept(const SOCKET sck, sockaddr_in * addr); static int Accept(const SOCKET sck, sockaddr_in * addr);
static int Ioctl(const SOCKET sck, const long flags, unsigned long * val); 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 // TODO: Add get/setsockopt() here
~plNet(); ~plNet();
private: private:

2
Sources/Plasma/PubUtilLib/plSurface/plLayerDepth.h

@ -40,4 +40,4 @@ public:
}; };
#endif plLayerDepth_inc #endif //plLayerDepth_inc

2
Sources/Plasma/PubUtilLib/plSurface/plLayerOr.h

@ -55,4 +55,4 @@ class plLayerOr : public plLayerInterface
virtual UInt32 Eval(double secs, UInt32 frame, UInt32 ignore); virtual UInt32 Eval(double secs, UInt32 frame, UInt32 ignore);
}; };
#endif _plLayerOr_h #endif //_plLayerOr_h

2
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) { void _VaultAddChronicleEntryCB(ENetError result, void* state, void * param, RelVaultNode* node) {
if (result == ENetError::kNetSuccess) { if (result == kNetSuccess) {
RelVaultNode* rvnFldr = GetChildFolderNode(GetPlayerNode(), plVault::kChronicleFolder, 1); RelVaultNode* rvnFldr = GetChildFolderNode(GetPlayerNode(), plVault::kChronicleFolder, 1);
if (rvnFldr != nil) if (rvnFldr != nil)
VaultAddChildNode(rvnFldr->nodeId, node->nodeId, 0, nil, nil); VaultAddChildNode(rvnFldr->nodeId, node->nodeId, 0, nil, nil);

Loading…
Cancel
Save