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

Merge remote-tracking branch 'dox/gcc-syntax'

Browse Source
This commit is contained in:
Michael Hansen
2011-08-02 20:39:47 -07:00
parent eae764f7ee 46c4a457e0
commit 88d10a8162
54 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/CoreLib/hsBounds.cpp
View File

@ -1673,7 +1673,7 @@ hsBool hsBounds3Ext::ISectBB(const hsBounds3Ext &other, const hsVector3 &myVel,
}
else
tstDepths[i+6] = 0;
#endif;
#endif
}
hsVector3 norm;

2
Sources/Plasma/CoreLib/hsStringTokenizer.h
View File

@ -91,4 +91,4 @@ private:
hsBool IsSep(wchar c);
};
#endif // _hsStringTokenizer_Included_
#endif // _hsStringTokenizer_Included_

2
Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h
View File

@ -154,4 +154,4 @@ private:
#endif plCameraModifier_inc
#endif //plCameraModifier_inc

2
Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h
View File

@ -76,4 +76,4 @@ public:
#endif plInterestingModifier_inc
#endif //plInterestingModifier_inc

2
Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h
View File

@ -232,4 +232,4 @@ private:
};
#endif plVirtualCam1_inc
#endif //plVirtualCam1_inc

8
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
View File

@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnKeyedObject/plKey.h"
#include "hsWindows.h"
bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
plDispatchLog::plDispatchLog() :
fLog(nil),
@ -184,7 +184,7 @@ static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
if (kiMsg)
{
const char* typeName = "(unknown)";
#define PrintKIType(type) if (kiMsg->GetCommand() == pfKIMsg::##type) typeName = #type;
#define PrintKIType(type) if (kiMsg->GetCommand() == pfKIMsg::type) typeName = #type;
PrintKIType(kHACKChatMsg); // send chat message via pfKIMsg
PrintKIType(kEnterChatMode); // toggle chat mode
PrintKIType(kSetChatFadeDelay); // set the chat delay
@ -253,7 +253,7 @@ static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
plClientMsg* clientMsg = plClientMsg::ConvertNoRef(msg);
if (clientMsg)
{
#define PrintType(type) if (clientMsg->GetClientMsgFlag() == plClientMsg::##type) info = #type;
#define PrintType(type) if (clientMsg->GetClientMsgFlag() == plClientMsg::type) info = #type;
PrintType(kLoadRoom);
PrintType(kLoadRoomHold);
PrintType(kUnloadRoom);
@ -297,7 +297,7 @@ static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
if (refMsg)
{
const char* typeName = nil;
#define GetType(type) if (refMsg->GetContext() == plRefMsg::##type) typeName = #type;
#define GetType(type) if (refMsg->GetContext() == plRefMsg::type) typeName = #type;
GetType(kOnCreate);
GetType(kOnDestroy);
GetType(kOnRequest);

6
Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp
View File

@ -834,7 +834,7 @@ template<class mapT>
std::vector<std::wstring> pfLocalizationDataMgr::pf3PartMap<mapT>::getAgeList()
{
std::vector<std::wstring> retVal;
ThreePartMap::iterator curAge;
typename ThreePartMap::iterator curAge;
for (curAge = fData.begin(); curAge != fData.end(); curAge++)
retVal.push_back(curAge->first);
@ -848,7 +848,7 @@ template<class mapT>
std::vector<std::wstring> pfLocalizationDataMgr::pf3PartMap<mapT>::getSetList(const std::wstring & age)
{
std::vector<std::wstring> retVal;
std::map<std::wstring, std::map<std::wstring, mapT> >::iterator curSet;
typename std::map<std::wstring, std::map<std::wstring, mapT> >::iterator curSet;
if (fData.find(age) == fData.end())
return retVal; // return an empty list, the age doesn't exist
@ -865,7 +865,7 @@ template<class mapT>
std::vector<std::wstring> pfLocalizationDataMgr::pf3PartMap<mapT>::getNameList(const std::wstring & age, const std::wstring & set)
{
std::vector<std::wstring> retVal;
std::map<std::wstring, mapT>::iterator curName;
typename std::map<std::wstring, mapT>::iterator curName;
if (fData.find(age) == fData.end())
return retVal; // return an empty list, the age doesn't exist

4
Sources/Plasma/FeatureLib/pfPython/cyAvatar.h
View File

@ -484,7 +484,7 @@ public:
//
// PURPOSE : Enter the personal book mode...stay until further notice.
//
static bool cyAvatar::EnterPBMode();
static bool EnterPBMode();
/////////////////////////////////////////////////////////////////////////////
//
@ -494,7 +494,7 @@ public:
// PURPOSE : Leave the personal book mode. Currently leaves any mode; will become
// : more specific in future version
//
static bool cyAvatar::ExitPBMode();
static bool ExitPBMode();
/////////////////////////////////////////////////////////////////////////////
//

10
Sources/Plasma/FeatureLib/pfPython/cyMisc.h
View File

@ -238,10 +238,10 @@ public:
//
static const char* GetClientName(pyKey &avKey);
static PyObject* cyMisc::GetAvatarKeyFromClientID(int clientID); // returns pyKey
static int cyMisc::GetLocalClientID();
static int cyMisc::GetClientIDFromAvatarKey(pyKey& avatar);
static hsBool cyMisc::ValidateKey(pyKey& key);
static PyObject* GetAvatarKeyFromClientID(int clientID); // returns pyKey
static int GetLocalClientID();
static int GetClientIDFromAvatarKey(pyKey& avatar);
static hsBool ValidateKey(pyKey& key);
@ -519,7 +519,7 @@ public:
//
// PURPOSE : knocks all the cameras off the current stack
//
static void cyMisc::ClearCameraStack();
static void ClearCameraStack();
/////////////////////////////////////////////////////////////////////////////
//

8
Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp
View File

@ -273,14 +273,14 @@ class pfListTextInBox : public pfGUIListText
UInt32 fMinHeight;
public:
pfListTextInBox::pfListTextInBox( const char *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
pfListTextInBox( const char *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
{
fMinWidth = min_width;
fMinHeight = min_height;
fJustify = pfGUIListText::kCenter;
}
pfListTextInBox::pfListTextInBox( const wchar_t *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
pfListTextInBox( const wchar_t *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
{
fMinWidth = min_width;
fMinHeight = min_height;
@ -313,7 +313,7 @@ class pfListPictureInBox : public pfGUIListPicture
UInt32 fSrcHeight;
public:
pfListPictureInBox::pfListPictureInBox( plKey mipKey, UInt32 x, UInt32 y, UInt32 width, UInt32 height, hsBool respectAlpha ) : pfGUIListPicture( mipKey,respectAlpha )
pfListPictureInBox( plKey mipKey, UInt32 x, UInt32 y, UInt32 width, UInt32 height, hsBool respectAlpha ) : pfGUIListPicture( mipKey,respectAlpha )
{
fSrcX = x;
fSrcY = y;
@ -378,7 +378,7 @@ class pfListPictureInBoxWithSwatches : public pfListPictureInBox
static UInt16 fSwatchSize, fSwatchOffset;
pfListPictureInBoxWithSwatches::pfListPictureInBoxWithSwatches( plKey mipKey, UInt32 x, UInt32 y,
pfListPictureInBoxWithSwatches( plKey mipKey, UInt32 x, UInt32 y,
UInt32 width, UInt32 height,
hsBool respectAlpha,
const hsColorRGBA &primaryColor, const hsColorRGBA &secondaryColor )

2
Sources/Plasma/FeatureLib/pfPython/pyImage.h
View File

@ -98,7 +98,7 @@ protected:
public:
#ifndef BUILDING_PYPLASMA
pyImage::~pyImage()
~pyImage()
{
if (fMipmap && fMipMapKey)
fMipMapKey->UnRefObject();

1
Sources/Plasma/NucleusLib/inc/CMakeLists.txt
View File

@ -1,5 +1,6 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib")
include_directories("../../NucleusLib/inc")
set(pnNucleusInc_HEADERS
hsGMatState.h

2
Sources/Plasma/NucleusLib/pnInputCore/plKeyMap.h
View File

@ -179,7 +179,7 @@ class plKeyMap : public plInputMap
void FindAllBindingsByKey( const plKeyCombo &combo, hsTArray<const plKeyBinding*> &result ) const;
// Searches for the binding by console command. Returns nil if not found
const plKeyBinding* plKeyMap::FindConsoleBinding( const char *command ) const;
const plKeyBinding* FindConsoleBinding( const char *command ) const;
// Make sure the given keys are clear of bindings, i.e. not used
void EnsureKeysClear( const plKeyCombo &key1, const plKeyCombo &key2 );

2
Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
View File

@ -119,7 +119,7 @@ class plFixedKeyValidator
private:
static plFixedKeyValidator fValidator;
plFixedKeyValidator::plFixedKeyValidator()
plFixedKeyValidator()
{
// verify that each Seed is in the correct spot...via the enum...
int i;

2
Sources/Plasma/NucleusLib/pnModifier/plLogicModBase.h
View File

@ -69,7 +69,7 @@ protected:
void CreateNotifyMsg();
public:
friend plVolumeSensorConditionalObjectNoArbitration;
friend class plVolumeSensorConditionalObjectNoArbitration;
plLogicModBase();
~plLogicModBase();
CLASSNAME_REGISTER( plLogicModBase );

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

@ -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();

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

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

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

@ -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);

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

@ -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

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

@ -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);

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

@ -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 );

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

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

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

@ -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

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

@ -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);

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

@ -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 );

2
Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.h
View File

@ -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

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

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

2
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.cpp
View File

@ -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]--;

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

@ -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;

5
Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.h
View File

@ -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
};

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

@ -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)
{

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

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

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

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

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

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

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

@ -68,7 +68,7 @@ void TimeBasedAvgRing<T>::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())

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

@ -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 );

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

@ -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 );

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

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

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

@ -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; }

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

@ -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;

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

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

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

@ -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;

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

@ -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<plDbgCollisionInfo> fDbgCollisionInfo;
void IDrawDebugDisplay();
#endif
void plPXPhysicalControllerCore::IHandleResize();
void IHandleResize();
hsTArray<plCollideMsg*> fQueuedCollideMsgs;
hsScalar fPreferedRadius;
hsScalar fPreferedHeight;

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

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

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

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

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

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

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

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

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

@ -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 );

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

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

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

@ -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<std::wstring> StringToLocal(const std::wstring & localizedText);
};
#endif // plLocalization_h_inc
#endif // plLocalization_h_inc

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

@ -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:

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

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

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

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

2
Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp
View File

@ -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);