OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04: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

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