OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ public:
kExitUnTrigger,
};
UInt32 fTriggerType;
uint32_t fTriggerType;
plKey fPickedObj;
plKey fHiteeObj;
plKey fHitterObj;

4
Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h
View File

@ -183,7 +183,7 @@ class plAGInstanceCallbackMsg : public plEventCallbackMsg
{
public:
plAGInstanceCallbackMsg() : plEventCallbackMsg(), fInstance(nil) {}
plAGInstanceCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, Int16 repeats=-1, UInt16 user=0) :
plAGInstanceCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, int16_t repeats=-1, uint16_t user=0) :
plEventCallbackMsg(receiver, e, idx, t, repeats, user), fInstance(nil) {}
CLASSNAME_REGISTER( plAGInstanceCallbackMsg );
@ -203,7 +203,7 @@ protected:
public:
plAGDetachCallbackMsg() : plEventCallbackMsg(), fAnimName(nil) {}
plAGDetachCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, Int16 repeats=-1, UInt16 user=0) :
plAGDetachCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, int16_t repeats=-1, uint16_t user=0) :
plEventCallbackMsg(receiver, e, idx, t, repeats, user), fAnimName(nil) {}
virtual ~plAGDetachCallbackMsg();

2
Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp
View File

@ -72,7 +72,7 @@ plAvCoopMsg::~plAvCoopMsg()
// plAvCoopMsg -----------------------------------
// ------------
plAvCoopMsg::plAvCoopMsg(Command cmd, UInt32 id, UInt16 serial)
plAvCoopMsg::plAvCoopMsg(Command cmd, uint32_t id, uint16_t serial)
: plMessage(nil, plAvatarMgr::GetInstance()->GetKey(), nil),
fInitiatorID(id),
fInitiatorSerial(serial),

6
Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h
View File

@ -99,7 +99,7 @@ public:
// constructors
plAvCoopMsg();
plAvCoopMsg(Command cmd, UInt32 id, UInt16 serial);
plAvCoopMsg(Command cmd, uint32_t id, uint16_t serial);
plAvCoopMsg(plKey sender, plCoopCoordinator *coordinateur);
~plAvCoopMsg();
@ -117,8 +117,8 @@ public:
//
/////////////////////////////////////////////////////////////////////////////////////
UInt32 fInitiatorID;
UInt16 fInitiatorSerial;
uint32_t fInitiatorID;
uint16_t fInitiatorSerial;
Command fCommand;

4
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
View File

@ -250,7 +250,7 @@ plAvSeekMsg::plAvSeekMsg()
plAvSeekMsg::plAvSeekMsg(const plKey& sender, const plKey& receiver,
const plKey &seekKey, float duration, hsBool smartSeek,
plAvAlignment alignType, char *animName, hsBool noSeek,
UInt8 flags, plKey finishKey)
uint8_t flags, plKey finishKey)
: plAvTaskMsg(sender, receiver),
fSeekPoint(seekKey),
fTargetPos(0, 0, 0),
@ -321,7 +321,7 @@ void plAvSeekMsg::Write(hsStream *stream, hsResMgr *mgr)
stream->WriteLEScalar(fDuration);
stream->WriteBool(fSmartSeek);
stream->WriteSafeString(fAnimName);
stream->WriteLE16(static_cast<UInt16>(fAlignType));
stream->WriteLE16(static_cast<uint16_t>(fAlignType));
stream->WriteBool(fNoSeek);
stream->WriteByte(fFlags);
mgr->WriteKey(stream, fFinishKey);

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

@ -190,7 +190,7 @@ public:
plAvSeekMsg();
plAvSeekMsg(const plKey& sender, const plKey& receiver, const plKey &seekKey, float duration, hsBool smartSeek,
plAvAlignment align = kAlignHandle, char *animName = nil, hsBool noSeek = false,
UInt8 flags = kSeekFlagForce3rdPersonOnStart, plKey finishKey = nil);
uint8_t flags = kSeekFlagForce3rdPersonOnStart, plKey finishKey = nil);
// plasma protocol
CLASSNAME_REGISTER( plAvSeekMsg );
@ -214,7 +214,7 @@ public:
hsBool fNoSeek;
char *fAnimName;
plAvAlignment fAlignType;
UInt8 fFlags;
uint8_t fFlags;
plKey fFinishKey;
};
@ -389,7 +389,7 @@ public:
kStealthCloaked,
kStealthCloakedButSeen,
};
UInt8 fMode;
uint8_t fMode;
int fLevel; // you are invisible to other players/CCRs of lower level
CLASSNAME_REGISTER(plAvatarStealthModeMsg);
@ -402,7 +402,7 @@ public:
class plAvatarBehaviorNotifyMsg : public plMessage
{
public:
UInt32 fType;
uint32_t fType;
hsBool state;
plAvatarBehaviorNotifyMsg() : fType(0),state(false) {}
@ -419,7 +419,7 @@ class plAvatarOpacityCallbackMsg : public plEventCallbackMsg
{
public:
plAvatarOpacityCallbackMsg() : plEventCallbackMsg() {}
plAvatarOpacityCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, Int16 repeats=-1, UInt16 user=0) :
plAvatarOpacityCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, int16_t repeats=-1, uint16_t user=0) :
plEventCallbackMsg(receiver, e, idx, t, repeats, user) {}
CLASSNAME_REGISTER( plAvatarOpacityCallbackMsg );
@ -449,7 +449,7 @@ class plAvatarPhysicsEnableCallbackMsg : public plEventCallbackMsg
{
public:
plAvatarPhysicsEnableCallbackMsg() : plEventCallbackMsg() {}
plAvatarPhysicsEnableCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, Int16 repeats=-1, UInt16 user=0) :
plAvatarPhysicsEnableCallbackMsg(plKey receiver, CallbackEvent e, int idx=0, hsScalar t=0, int16_t repeats=-1, uint16_t user=0) :
plEventCallbackMsg(receiver, e, idx, t, repeats, user) {}
CLASSNAME_REGISTER( plAvatarPhysicsEnableCallbackMsg );

2
Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.cpp
View File

@ -64,7 +64,7 @@ void plBulletMsg::Write(hsStream* stream, hsResMgr* mgr)
{
IMsgWrite(stream, mgr);
stream->WriteByte(UInt8(fCmd));
stream->WriteByte(uint8_t(fCmd));
fFrom.Write(stream);
fDir.Write(stream);

14
Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h
View File

@ -63,7 +63,7 @@ public:
class plCCRPetitionMsg : public plCCRMessage
{
private:
UInt8 fPetitionType;
uint8_t fPetitionType;
std::string fNote;
std::string fTitle;
public:
@ -82,8 +82,8 @@ public:
const char* GetTitle() const { return fTitle.c_str(); }
// petition type
void SetType(const UInt8 t) { fPetitionType=t; }
UInt8 GetType() const { return fPetitionType; }
void SetType(const uint8_t t) { fPetitionType=t; }
uint8_t GetType() const { return fPetitionType; }
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);
@ -96,7 +96,7 @@ class plCCRInvisibleMsg : public plCCRMessage
{
public:
plKey fAvKey;
UInt8 fInvisLevel; // 0 means visible
uint8_t fInvisLevel; // 0 means visible
plCCRInvisibleMsg();
~plCCRInvisibleMsg() {}
@ -124,7 +124,7 @@ public:
};
std::string fString;
Type fType;
UInt32 fCCRPlayerID;
uint32_t fCCRPlayerID;
plCCRCommunicationMsg();
~plCCRCommunicationMsg() {}
@ -139,8 +139,8 @@ public:
void SetType(Type t) { fType=t; }
Type GetType() const { return fType; }
void SetCCRPlayerID(UInt32 t) { fCCRPlayerID=t; }
UInt32 GetCCRPlayerID() const { return fCCRPlayerID; }
void SetCCRPlayerID(uint32_t t) { fCCRPlayerID=t; }
uint32_t GetCCRPlayerID() const { return fCCRPlayerID; }
virtual void Read(hsStream* stream, hsResMgr* mgr);
virtual void Write(hsStream* stream, hsResMgr* mgr);

4
Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.cpp
View File

@ -77,8 +77,8 @@ void plClimbMsg::Read(hsStream *stream, hsResMgr *mgr)
void plClimbMsg::Write(hsStream *stream, hsResMgr *mgr)
{
plMessage::IMsgWrite(stream, mgr);
stream->WriteLE32(static_cast<UInt32>(fCommand));
stream->WriteLE32(static_cast<UInt32>(fDirection));
stream->WriteLE32(static_cast<uint32_t>(fCommand));
stream->WriteLE32(static_cast<uint32_t>(fDirection));
stream->WriteBool(fStatus);
mgr->WriteKey(stream, fTarget);
}

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

@ -60,7 +60,7 @@ public:
CLASSNAME_REGISTER( plCondRefMsg );
GETINTERFACE_ANY( plCondRefMsg, plRefMsg );
Int8 fWhich;
int8_t fWhich;
// IO - not really applicable to ref msgs, but anyway
void Read(hsStream* stream, hsResMgr* mgr)

8
Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h
View File

@ -53,7 +53,7 @@ class plConsoleMsg : public plMessage
{
protected:
UInt32 fCmd;
uint32_t fCmd;
char *fString;
public:
@ -66,7 +66,7 @@ public:
};
plConsoleMsg() : plMessage(nil, nil, nil), fCmd( 0 ), fString( nil ) { SetBCastFlag(kBCastByExactType); }
plConsoleMsg( UInt32 cmd, const char *str ) :
plConsoleMsg( uint32_t cmd, const char *str ) :
plMessage(nil, nil, nil), fCmd( cmd ), fString(hsStrcpy(str))
{ SetBCastFlag( kBCastByExactType ); }
@ -75,10 +75,10 @@ public:
CLASSNAME_REGISTER( plConsoleMsg );
GETINTERFACE_ANY( plConsoleMsg, plMessage );
UInt32 GetCmd( void ) const { return fCmd; }
uint32_t GetCmd( void ) const { return fCmd; }
const char *GetString( void ) const { return fString; };
void SetCmd (UInt32 cmd) { fCmd = cmd; }
void SetCmd (uint32_t cmd) { fCmd = cmd; }
void SetString (const char str[]) { FREE(fString); fString = hsStrcpy(str); }
virtual void Read(hsStream* s, hsResMgr* mgr)

4
Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.cpp
View File

@ -51,11 +51,11 @@ plDynaDecalEnableMsg::plDynaDecalEnableMsg()
fKey(nil),
fFlags(0),
fConTime(0),
fID(UInt32(-1))
fID(uint32_t(-1))
{
}
plDynaDecalEnableMsg::plDynaDecalEnableMsg(const plKey& r, const plKey& a, double t, hsScalar w, hsBool end, UInt32 id, hsBool isArm)
plDynaDecalEnableMsg::plDynaDecalEnableMsg(const plKey& r, const plKey& a, double t, hsScalar w, hsBool end, uint32_t id, hsBool isArm)
: plMessage(nil, r, nil),
fKey(a),
fFlags(0),

10
Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h
View File

@ -59,11 +59,11 @@ protected:
plKey fKey;
double fConTime;
hsScalar fWetLength;
UInt32 fFlags;
UInt32 fID;
uint32_t fFlags;
uint32_t fID;
public:
plDynaDecalEnableMsg();
plDynaDecalEnableMsg(const plKey& r, const plKey& armOrShapeKey, double conTime, hsScalar wetLength, hsBool end, UInt32 id=UInt32(-1), hsBool isArm=true);
plDynaDecalEnableMsg(const plKey& r, const plKey& armOrShapeKey, double conTime, hsScalar wetLength, hsBool end, uint32_t id=uint32_t(-1), hsBool isArm=true);
~plDynaDecalEnableMsg();
CLASSNAME_REGISTER( plDynaDecalEnableMsg );
@ -91,8 +91,8 @@ public:
hsBool AtEnd() const { return 0 != (fFlags & kAtEnd); }
void SetAtEnd(hsBool b) { if(b)fFlags |= kAtEnd; else fFlags &= ~kAtEnd; }
UInt32 GetID() const { return fID; }
void SetID(UInt32 n) { fID = n; }
uint32_t GetID() const { return fID; }
void SetID(uint32_t n) { fID = n; }
};
#endif // plDynaDecalEnableMsg_inc

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

@ -64,7 +64,7 @@ public:
kSetRefresh = 0x40
};
UInt32 fCmd;
uint32_t fCmd;
hsPoint3 fPos;
hsScalar fHither;

34
Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp
View File

@ -60,31 +60,31 @@ void plDynamicTextMsg::SetTextColor( hsColorRGBA &c, hsBool blockRGB )
fBlockRGB = blockRGB;
}
void plDynamicTextMsg::SetFont( const char *face, Int16 size, hsBool isBold )
void plDynamicTextMsg::SetFont( const char *face, int16_t size, hsBool isBold )
{
hsAssert( ( fCmd & ( kPosCmds | kStringCmds | kFlagCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kPosCmds | kStringCmds | kFlagCmds );
fCmd |= kSetFont;
fString = hsStringToWString( face );
fX = size;
fFlags = (UInt32)isBold;
fFlags = (uint32_t)isBold;
}
void plDynamicTextMsg::SetLineSpacing( Int16 spacing )
void plDynamicTextMsg::SetLineSpacing( int16_t spacing )
{
fCmd |= kSetLineSpacing;
fLineSpacing = spacing;
}
void plDynamicTextMsg::SetJustify( UInt8 justifyFlags )
void plDynamicTextMsg::SetJustify( uint8_t justifyFlags )
{
hsAssert( ( fCmd & ( kFlagCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kFlagCmds );
fCmd |= kSetJustify;
fFlags = (UInt32)justifyFlags;
fFlags = (uint32_t)justifyFlags;
}
void plDynamicTextMsg::FillRect( UInt16 left, UInt16 top, UInt16 right, UInt16 bottom, hsColorRGBA &c )
void plDynamicTextMsg::FillRect( uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, hsColorRGBA &c )
{
hsAssert( ( fCmd & ( kRectCmds | kColorCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kRectCmds | kColorCmds );
@ -97,7 +97,7 @@ void plDynamicTextMsg::FillRect( UInt16 left, UInt16 top, UInt16 right, UInt1
fColor = c;
}
void plDynamicTextMsg::FrameRect( UInt16 left, UInt16 top, UInt16 right, UInt16 bottom, hsColorRGBA &c )
void plDynamicTextMsg::FrameRect( uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, hsColorRGBA &c )
{
hsAssert( ( fCmd & ( kRectCmds | kColorCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kRectCmds | kColorCmds );
@ -110,14 +110,14 @@ void plDynamicTextMsg::FrameRect( UInt16 left, UInt16 top, UInt16 right, UInt
fColor = c;
}
void plDynamicTextMsg::DrawString( Int16 x, Int16 y, const char *text )
void plDynamicTextMsg::DrawString( int16_t x, int16_t y, const char *text )
{
wchar_t *wString = hsStringToWString(text);
DrawString(x,y,wString);
delete [] wString;
}
void plDynamicTextMsg::DrawString( Int16 x, Int16 y, const wchar_t *text )
void plDynamicTextMsg::DrawString( int16_t x, int16_t y, const wchar_t *text )
{
hsAssert( ( fCmd & ( kStringCmds | kPosCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kStringCmds | kPosCmds );
@ -130,14 +130,14 @@ void plDynamicTextMsg::DrawString( Int16 x, Int16 y, const wchar_t *text )
fY = y;
}
void plDynamicTextMsg::DrawClippedString( Int16 x, Int16 y, UInt16 clipLeft, UInt16 clipTop, UInt16 clipRight, UInt16 clipBottom, const char *text )
void plDynamicTextMsg::DrawClippedString( int16_t x, int16_t y, uint16_t clipLeft, uint16_t clipTop, uint16_t clipRight, uint16_t clipBottom, const char *text )
{
wchar_t *wString = hsStringToWString(text);
DrawClippedString(x,y,clipLeft,clipTop,clipRight,clipBottom,wString);
delete [] wString;
}
void plDynamicTextMsg::DrawClippedString( Int16 x, Int16 y, UInt16 clipLeft, UInt16 clipTop, UInt16 clipRight, UInt16 clipBottom, const wchar_t *text )
void plDynamicTextMsg::DrawClippedString( int16_t x, int16_t y, uint16_t clipLeft, uint16_t clipTop, uint16_t clipRight, uint16_t clipBottom, const wchar_t *text )
{
hsAssert( ( fCmd & ( kStringCmds | kPosCmds | kRectCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kStringCmds | kPosCmds | kRectCmds );
@ -155,14 +155,14 @@ void plDynamicTextMsg::DrawClippedString( Int16 x, Int16 y, UInt16 clipLeft,
fBottom = clipBottom;
}
void plDynamicTextMsg::DrawWrappedString( Int16 x, Int16 y, UInt16 wrapWidth, UInt16 wrapHeight, const char *text )
void plDynamicTextMsg::DrawWrappedString( int16_t x, int16_t y, uint16_t wrapWidth, uint16_t wrapHeight, const char *text )
{
wchar_t *wString = hsStringToWString(text);
DrawWrappedString(x,y,wrapWidth,wrapHeight,wString);
delete [] wString;
}
void plDynamicTextMsg::DrawWrappedString( Int16 x, Int16 y, UInt16 wrapWidth, UInt16 wrapHeight, const wchar_t *text )
void plDynamicTextMsg::DrawWrappedString( int16_t x, int16_t y, uint16_t wrapWidth, uint16_t wrapHeight, const wchar_t *text )
{
hsAssert( ( fCmd & ( kStringCmds | kPosCmds | kRectCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kStringCmds | kPosCmds | kRectCmds );
@ -178,7 +178,7 @@ void plDynamicTextMsg::DrawWrappedString( Int16 x, Int16 y, UInt16 wrapWidth,
fBottom = wrapHeight;
}
void plDynamicTextMsg::DrawImage( Int16 x, Int16 y, plKey &image, hsBool respectAlpha )
void plDynamicTextMsg::DrawImage( int16_t x, int16_t y, plKey &image, hsBool respectAlpha )
{
hsAssert( ( fCmd & ( kPosCmds | kFlagCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kPosCmds | kFlagCmds );
@ -187,10 +187,10 @@ void plDynamicTextMsg::DrawImage( Int16 x, Int16 y, plKey &image, hsBool resp
fImageKey = image;
fX = x;
fY = y;
fFlags = (UInt32)respectAlpha;
fFlags = (uint32_t)respectAlpha;
}
void plDynamicTextMsg::DrawClippedImage( Int16 x, Int16 y, plKey &image, UInt16 clipX, UInt16 clipY, UInt16 clipWidth, UInt16 clipHeight, hsBool respectAlpha )
void plDynamicTextMsg::DrawClippedImage( int16_t x, int16_t y, plKey &image, uint16_t clipX, uint16_t clipY, uint16_t clipWidth, uint16_t clipHeight, hsBool respectAlpha )
{
hsAssert( ( fCmd & ( kPosCmds | kFlagCmds | kRectCmds ) ) == 0, "Attempting to issue conflicting drawText commands" );
fCmd &= ~( kPosCmds | kFlagCmds | kRectCmds );
@ -203,7 +203,7 @@ void plDynamicTextMsg::DrawClippedImage( Int16 x, Int16 y, plKey &image, UInt
fTop = clipY;
fRight = clipWidth;
fBottom = clipHeight;
fFlags = (UInt32)respectAlpha;
fFlags = (uint32_t)respectAlpha;
}
void plDynamicTextMsg::Read( hsStream *s, hsResMgr *mgr )

36
Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h
View File

@ -59,13 +59,13 @@ class plDynamicTextMsg : public plMessage
friend class plDynamicTextMap;
protected:
UInt16 fCmd;
uint16_t fCmd;
// Position (fX is also used for font size)
Int16 fX, fY;
int16_t fX, fY;
// A rectangle
UInt16 fLeft, fTop, fRight, fBottom;
uint16_t fLeft, fTop, fRight, fBottom;
// Colors
hsColorRGBA fClearColor;
@ -78,10 +78,10 @@ protected:
plKey fImageKey;
// Misc flags field
UInt32 fFlags;
uint32_t fFlags;
hsBool fBlockRGB;
Int16 fLineSpacing;
int16_t fLineSpacing;
public:
plDynamicTextMsg() : plMessage( nil, nil, nil ) { fCmd = 0; fString = nil; fImageKey = nil; fFlags = 0; fBlockRGB = false; }
@ -122,19 +122,19 @@ public:
// The following are mutually exclusive commands 'cause they share some parameters
void SetTextColor( hsColorRGBA &c, hsBool blockRGB = false );
void SetFont( const char *face, Int16 size, hsBool isBold = false );
void SetLineSpacing( Int16 spacing );
void FillRect( UInt16 left, UInt16 top, UInt16 right, UInt16 bottom, hsColorRGBA &c );
void FrameRect( UInt16 left, UInt16 top, UInt16 right, UInt16 bottom, hsColorRGBA &c );
void DrawString( Int16 x, Int16 y, const char *text );
void DrawString( Int16 x, Int16 y, const wchar_t *text );
void DrawClippedString( Int16 x, Int16 y, UInt16 clipLeft, UInt16 clipTop, UInt16 clipRight, UInt16 clipBottom, const char *text );
void DrawClippedString( Int16 x, Int16 y, UInt16 clipLeft, UInt16 clipTop, UInt16 clipRight, UInt16 clipBottom, const wchar_t *text );
void DrawWrappedString( Int16 x, Int16 y, UInt16 wrapWidth, UInt16 wrapHeight, const char *text );
void DrawWrappedString( Int16 x, Int16 y, UInt16 wrapWidth, UInt16 wrapHeight, const wchar_t *text );
void DrawImage( Int16 x, Int16 y, plKey &image, hsBool respectAlpha = false );
void DrawClippedImage( Int16 x, Int16 y, plKey &image, UInt16 clipX, UInt16 clipY, UInt16 clipWidth, UInt16 clipHeight, hsBool respectAlpha = false );
void SetJustify( UInt8 justifyFlags );
void SetFont( const char *face, int16_t size, hsBool isBold = false );
void SetLineSpacing( int16_t spacing );
void FillRect( uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, hsColorRGBA &c );
void FrameRect( uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, hsColorRGBA &c );
void DrawString( int16_t x, int16_t y, const char *text );
void DrawString( int16_t x, int16_t y, const wchar_t *text );
void DrawClippedString( int16_t x, int16_t y, uint16_t clipLeft, uint16_t clipTop, uint16_t clipRight, uint16_t clipBottom, const char *text );
void DrawClippedString( int16_t x, int16_t y, uint16_t clipLeft, uint16_t clipTop, uint16_t clipRight, uint16_t clipBottom, const wchar_t *text );
void DrawWrappedString( int16_t x, int16_t y, uint16_t wrapWidth, uint16_t wrapHeight, const char *text );
void DrawWrappedString( int16_t x, int16_t y, uint16_t wrapWidth, uint16_t wrapHeight, const wchar_t *text );
void DrawImage( int16_t x, int16_t y, plKey &image, hsBool respectAlpha = false );
void DrawClippedImage( int16_t x, int16_t y, plKey &image, uint16_t clipX, uint16_t clipY, uint16_t clipWidth, uint16_t clipHeight, hsBool respectAlpha = false );
void SetJustify( uint8_t justifyFlags );
// IO
void Read(hsStream* stream, hsResMgr* mgr);
void Write(hsStream* stream, hsResMgr* mgr);

6
Sources/Plasma/PubUtilLib/plMessage/plEnvEffectMsg.h
View File

@ -85,7 +85,7 @@ public:
class plEnvAudioEffectMsg : public plEnvEffectMsg
{
UInt32 fPreset;
uint32_t fPreset;
public:
plEnvAudioEffectMsg(){SetBCastFlag(plMessage::kPropagateToModifiers);}
@ -98,8 +98,8 @@ public:
CLASSNAME_REGISTER( plEnvAudioEffectMsg );
GETINTERFACE_ANY( plEnvAudioEffectMsg, plEnvEffectMsg );
UInt32 GetEffect() { return fPreset; }
void SetEffect(UInt32 i) { fPreset = i; }
uint32_t GetEffect() { return fPreset; }
void SetEffect(uint32_t i) { fPreset = i; }
// IO
void Read(hsStream* stream, hsResMgr* mgr)

6
Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h
View File

@ -58,7 +58,7 @@ public:
};
protected:
UInt8 fCmd;
uint8_t fCmd;
public:
plExcludeRegionMsg() : fCmd(kClear), fSynchFlags(0) {}
@ -69,9 +69,9 @@ public:
GETINTERFACE_ANY(plExcludeRegionMsg, plMessage);
void SetCmd(CmdType cmd) { fCmd = cmd; }
UInt8 GetCmd() { return fCmd; }
uint8_t GetCmd() { return fCmd; }
UInt32 fSynchFlags;
uint32_t fSynchFlags;
// IO
void Read(hsStream* stream, hsResMgr* mgr)
{

10
Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp
View File

@ -134,7 +134,7 @@ plControlEventMsg::~plControlEventMsg()
void plControlEventMsg::Read(hsStream* stream, hsResMgr* mgr)
{
plInputEventMsg::Read(stream, mgr);
stream->ReadLE((Int32*)&fControlCode);
stream->ReadLE((int32_t*)&fControlCode);
stream->ReadLE(&fControlActivated);
stream->ReadLE(&fControlPct);
fTurnToPt.Read(stream);
@ -146,7 +146,7 @@ void plControlEventMsg::Read(hsStream* stream, hsResMgr* mgr)
void plControlEventMsg::Write(hsStream* stream, hsResMgr* mgr)
{
plInputEventMsg::Write(stream, mgr);
stream->WriteLE((Int32)fControlCode);
stream->WriteLE((int32_t)fControlCode);
stream->WriteLE(fControlActivated);
stream->WriteLE(fControlPct);
fTurnToPt.Write(stream);
@ -172,7 +172,7 @@ void plControlEventMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
contentFlags.Read(s);
if (contentFlags.IsBitSet(kControlEventMsgCode))
s->ReadLE((Int32*)&fControlCode);
s->ReadLE((int32_t*)&fControlCode);
if (contentFlags.IsBitSet(kControlEventMsgActivated))
s->ReadLE(&fControlActivated);
@ -201,7 +201,7 @@ void plControlEventMsg::WriteVersion(hsStream* s, hsResMgr* mgr)
contentFlags.Write(s);
// kControlEventMsgCode,
s->WriteLE((Int32)fControlCode);
s->WriteLE((int32_t)fControlCode);
// kControlEventMsgActivated,
s->WriteLE(fControlActivated);
@ -278,7 +278,7 @@ const ControlEventCode plAvatarInputStateMsg::fCodeMap[] =
B_CONTROL_MODIFIER_STRAFE,
B_CONTROL_LADDER_INVERTED,
};
const UInt8 plAvatarInputStateMsg::fMapSize = 12;
const uint8_t plAvatarInputStateMsg::fMapSize = 12;
void plAvatarInputStateMsg::Read(hsStream *s, hsResMgr *mgr)
{

12
Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h
View File

@ -165,7 +165,7 @@ public:
void Read(hsStream* stream, hsResMgr* mgr)
{
plInputEventMsg::Read(stream, mgr);
stream->ReadLE((Int32*)&fKeyCode);
stream->ReadLE((int32_t*)&fKeyCode);
stream->ReadLE(&fKeyDown);
stream->ReadLE(&fCapsLockKeyDown);
stream->ReadLE(&fShiftKeyDown);
@ -176,7 +176,7 @@ public:
void Write(hsStream* stream, hsResMgr* mgr)
{
plInputEventMsg::Write(stream, mgr);
stream->WriteLE((Int32)fKeyCode);
stream->WriteLE((int32_t)fKeyCode);
stream->WriteLE(fKeyDown);
stream->WriteLE(fCapsLockKeyDown);
stream->WriteLE(fShiftKeyDown);
@ -224,7 +224,7 @@ public:
void Read(hsStream* stream, hsResMgr* mgr)
{
plInputEventMsg::Read(stream, mgr);
stream->ReadLE((Int32*)&fKeyCode);
stream->ReadLE((int32_t*)&fKeyCode);
stream->ReadLE(&fKeyDown);
stream->ReadLE(&fCapsLockKeyDown);
stream->ReadLE(&fShiftKeyDown);
@ -234,7 +234,7 @@ public:
void Write(hsStream* stream, hsResMgr* mgr)
{
plInputEventMsg::Write(stream, mgr);
stream->WriteLE((Int32)fKeyCode);
stream->WriteLE((int32_t)fKeyCode);
stream->WriteLE(fKeyDown);
stream->WriteLE(fCapsLockKeyDown);
stream->WriteLE(fShiftKeyDown);
@ -402,7 +402,7 @@ public:
class plAvatarInputStateMsg : public plMessage
{
public:
UInt16 fState;
uint16_t fState;
plAvatarInputStateMsg() : plMessage(), fState(0) {}
~plAvatarInputStateMsg() {}
@ -418,7 +418,7 @@ public:
// Mapping of bits to the control events we care about
static const ControlEventCode fCodeMap[];
static const UInt8 fMapSize;
static const uint8_t fMapSize;
static hsBool IsCodeInMap(ControlEventCode code);
};

14
Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h
View File

@ -59,9 +59,9 @@ class plInputIfaceMgrMsg : public plMessage
{
protected:
UInt8 fCommand;
uint8_t fCommand;
plInputInterface *fInterface;
UInt32 fPageID;
uint32_t fPageID;
const char* ageName;
const char* ageFileName;
const char* spawnPoint;
@ -89,9 +89,9 @@ class plInputIfaceMgrMsg : public plMessage
};
plInputIfaceMgrMsg() : plMessage( nil, nil, nil ) { SetBCastFlag( kBCastByExactType ); fInterface = nil; ageName = ageFileName = spawnPoint = 0; fAvKey = nil; }
plInputIfaceMgrMsg( plKey &receiver, UInt8 command ) : plMessage( nil, nil, nil ) { AddReceiver( receiver ); fCommand = command; fInterface = nil; fAvKey = nil; ageName = ageFileName = spawnPoint = 0;}
plInputIfaceMgrMsg( UInt8 command ) : plMessage( nil, nil, nil ) { SetBCastFlag( kBCastByExactType ); fCommand = command; fInterface = nil; fAvKey = nil; ageName = ageFileName = spawnPoint = 0;}
plInputIfaceMgrMsg( UInt8 command, UInt32 pageID ) : plMessage( nil, nil, nil ) { SetBCastFlag( kBCastByExactType ); fCommand = command; fPageID = pageID; fInterface = nil; fAvKey = nil; ageName = ageFileName = spawnPoint = 0;}
plInputIfaceMgrMsg( plKey &receiver, uint8_t command ) : plMessage( nil, nil, nil ) { AddReceiver( receiver ); fCommand = command; fInterface = nil; fAvKey = nil; ageName = ageFileName = spawnPoint = 0;}
plInputIfaceMgrMsg( uint8_t command ) : plMessage( nil, nil, nil ) { SetBCastFlag( kBCastByExactType ); fCommand = command; fInterface = nil; fAvKey = nil; ageName = ageFileName = spawnPoint = 0;}
plInputIfaceMgrMsg( uint8_t command, uint32_t pageID ) : plMessage( nil, nil, nil ) { SetBCastFlag( kBCastByExactType ); fCommand = command; fPageID = pageID; fInterface = nil; fAvKey = nil; ageName = ageFileName = spawnPoint = 0;}
~plInputIfaceMgrMsg();
CLASSNAME_REGISTER( plInputIfaceMgrMsg );
@ -127,8 +127,8 @@ class plInputIfaceMgrMsg : public plMessage
const char* GetSpawnPoint() { return spawnPoint; }
void SetAgeInstanceGuid(const plUUID& guid) { ageInstanceGuid = guid; }
const plUUID& GetAgeInstanceGuid() { return ageInstanceGuid; }
UInt8 GetCommand( void ) { return fCommand; }
UInt32 GetPageID( void ) { return fPageID; }
uint8_t GetCommand( void ) { return fCommand; }
uint32_t GetPageID( void ) { return fPageID; }
void SetIFace( plInputInterface *iface );
plInputInterface *GetIFace( void ) const { return fInterface; }
plKey& GetAvKey( void ) { return fAvKey; }

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

@ -65,7 +65,7 @@ public:
hsScalar fSize;
hsPoint3 fPos;
plKey fObj;
UInt8 fType;
uint8_t fType;
// IO
void Read(hsStream* stream, hsResMgr* mgr)

4
Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h
View File

@ -58,8 +58,8 @@ public:
plKey fObj;
hsPoint3 fHitPoint;
hsBool fNoHit;
UInt32 fRequestID;
UInt32 fHitFlags;
uint32_t fRequestID;
uint32_t fHitFlags;
hsVector3 fNormal;
float fDistance;

6
Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h
View File

@ -86,8 +86,8 @@ public:
ReportType GetReportType() const { return fReportType; }
/** An ID invented by the caller for their own bookkeeping. */
void SetRequestID(UInt32 id) { fRequestID = id; }
UInt32 GetRequestID() { return fRequestID; }
void SetRequestID(uint32_t id) { fRequestID = id; }
uint32_t GetRequestID() { return fRequestID; }
/** If we get a hit on the first pass, we'll then double-check the remaining
segment (start->first hit) against the "cull db". If *any* hit is found,
@ -111,7 +111,7 @@ private:
plSimDefs::plLOSDB fCullDB; // if we find a hit, see if anything in this DB blocks it.
TestType fTestType; // testing closest hit or just any?
ReportType fReportType; // reporting hits, misses, or both?
UInt32 fRequestID;
uint32_t fRequestID;
};
#endif // plLOSRequestMsg_inc

6
Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h
View File

@ -59,13 +59,13 @@ public:
};
plLayRefMsg() : fType(-1), fWhich(-1) {}
plLayRefMsg(const plKey &r, UInt8 f, Int8 which, Int8 type) : plRefMsg(r, f), fWhich(which), fType(type) {}
plLayRefMsg(const plKey &r, uint8_t f, int8_t which, int8_t type) : plRefMsg(r, f), fWhich(which), fType(type) {}
CLASSNAME_REGISTER( plLayRefMsg );
GETINTERFACE_ANY( plLayRefMsg, plRefMsg );
Int8 fType;
Int8 fWhich;
int8_t fType;
int8_t fWhich;
// IO - not really applicable to ref msgs, but anyway
void Read(hsStream* stream, hsResMgr* mgr);

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

@ -51,7 +51,7 @@ class plLightRefMsg : public plRefMsg
{
public:
plLightRefMsg() {}
plLightRefMsg(const plKey& s, const plKey &r, hsKeyedObject* l, UInt8 c) : plRefMsg(r, c) { SetRef(l); SetSender(s); }
plLightRefMsg(const plKey& s, const plKey &r, hsKeyedObject* l, uint8_t c) : plRefMsg(r, c) { SetRef(l); SetSender(s); }
CLASSNAME_REGISTER( plLightRefMsg );
GETINTERFACE_ANY( plLightRefMsg, plRefMsg );

8
Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp
View File

@ -68,11 +68,11 @@ plLinkToAgeMsg::~plLinkToAgeMsg()
}
// StreamVersion needed for back compatibility.
UInt8 plLinkToAgeInfo_StreamVersion = 0;
uint8_t plLinkToAgeInfo_StreamVersion = 0;
void plLinkToAgeMsg::Read(hsStream* stream, hsResMgr* mgr)
{
plMessage::IMsgRead( stream, mgr );
UInt8 ltaVer = stream->ReadByte();
uint8_t ltaVer = stream->ReadByte();
fAgeLink.Read( stream, mgr );
fLinkInAnimName = stream->ReadSafeString();
}
@ -314,7 +314,7 @@ void plLinkEffectBCMsg::Write(hsStream* stream, hsResMgr* mgr)
stream->WriteLE32(fLinkFlags);
}
void plLinkEffectBCMsg::SetLinkFlag(UInt32 flag, hsBool on /* = true */)
void plLinkEffectBCMsg::SetLinkFlag(uint32_t flag, hsBool on /* = true */)
{
if (on)
fLinkFlags |= flag;
@ -322,7 +322,7 @@ void plLinkEffectBCMsg::SetLinkFlag(UInt32 flag, hsBool on /* = true */)
fLinkFlags &= ~flag;
}
hsBool plLinkEffectBCMsg::HasLinkFlag(UInt32 flag)
hsBool plLinkEffectBCMsg::HasLinkFlag(uint32_t flag)
{
return fLinkFlags & flag;
}

14
Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h
View File

@ -90,7 +90,7 @@ public:
class plLinkingMgrMsg : public plMessage
{
UInt8 fLinkingMgrCmd;
uint8_t fLinkingMgrCmd;
plCreatableListHelper fArgs;
public:
@ -100,8 +100,8 @@ public:
CLASSNAME_REGISTER( plLinkingMgrMsg );
GETINTERFACE_ANY( plLinkingMgrMsg, plMessage );
UInt8 GetCmd() const { return fLinkingMgrCmd; }
void SetCmd( UInt8 v ) { fLinkingMgrCmd=v; }
uint8_t GetCmd() const { return fLinkingMgrCmd; }
void SetCmd( uint8_t v ) { fLinkingMgrCmd=v; }
plCreatableListHelper * GetArgs() { return &fArgs; }
void Read( hsStream* stream, hsResMgr* mgr );
@ -146,7 +146,7 @@ public:
void ReadVersion(hsStream* s, hsResMgr* mgr);
void WriteVersion(hsStream* s, hsResMgr* mgr);
Int32 fEffects;
int32_t fEffects;
};
////////////////////////////////////////////////////////////////////
@ -180,7 +180,7 @@ public:
class plLinkEffectBCMsg : public plMessage
{
protected:
UInt32 fLinkFlags;
uint32_t fLinkFlags;
public:
enum // link flags
@ -202,8 +202,8 @@ public:
void Read(hsStream* stream, hsResMgr* mgr);
void Write(hsStream* stream, hsResMgr* mgr);
void SetLinkFlag(UInt32 flag, hsBool on = true);
hsBool HasLinkFlag(UInt32 flag);
void SetLinkFlag(uint32_t flag, hsBool on = true);
hsBool HasLinkFlag(uint32_t flag);
plKey fLinkKey;
};

6
Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp
View File

@ -66,7 +66,7 @@ void plListenerMsg::Write(hsStream* s, hsResMgr* mgr)
}
plSetListenerMsg::plSetListenerMsg( UInt8 type, const plKey &srcKey, hsBool binding ) : plMessage( nil, nil, nil )
plSetListenerMsg::plSetListenerMsg( uint8_t type, const plKey &srcKey, hsBool binding ) : plMessage( nil, nil, nil )
{
plUoid uoid( kListenerMod_KEY );
plKey pLKey = hsgResMgr::ResMgr()->FindKey( uoid );
@ -94,10 +94,10 @@ void plSetListenerMsg::Write( hsStream *s, hsResMgr *mgr )
s->WriteBool( fBinding );
}
void plSetListenerMsg::Set( const plKey &key, UInt8 type, hsBool binding )
void plSetListenerMsg::Set( const plKey &key, uint8_t type, hsBool binding )
{
fSrcKey = key;
fType = (UInt8)type;
fType = (uint8_t)type;
fBinding = binding;
}

8
Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h
View File

@ -86,7 +86,7 @@ class plSetListenerMsg : public plMessage
{
protected:
UInt8 fType;
uint8_t fType;
plKey fSrcKey;
hsBool fBinding;
@ -103,7 +103,7 @@ public:
};
plSetListenerMsg() : plMessage( nil, nil, nil ) { fType = 0; fBinding = false; }
plSetListenerMsg( UInt8 type, const plKey &srcKey, hsBool binding );
plSetListenerMsg( uint8_t type, const plKey &srcKey, hsBool binding );
~plSetListenerMsg();
CLASSNAME_REGISTER( plSetListenerMsg );
@ -112,10 +112,10 @@ public:
virtual void Read(hsStream* s, hsResMgr* mgr);
virtual void Write(hsStream* s, hsResMgr* mgr);
void Set( const plKey &key, UInt8 type, hsBool binding );
void Set( const plKey &key, uint8_t type, hsBool binding );
plKey &GetSrcKey( void ) { return fSrcKey; }
UInt8 GetType( void ) const { return fType; }
uint8_t GetType( void ) const { return fType; }
hsBool IsBinding( void ) const { return fBinding; }
};

4
Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp
View File

@ -52,7 +52,7 @@ void plLoadAgeMsg::Read(hsStream* stream, hsResMgr* mgr)
delete [] fAgeFilename;
// read agename
UInt8 len;
uint8_t len;
stream->ReadLE(&len);
if (len)
{
@ -70,7 +70,7 @@ void plLoadAgeMsg::Write(hsStream* stream, hsResMgr* mgr)
plMessage::IMsgWrite(stream, mgr);
// write agename
UInt8 len=fAgeFilename?hsStrlen(fAgeFilename):0;
uint8_t len=fAgeFilename?hsStrlen(fAgeFilename):0;
stream->WriteLE(len);
if (len)
{

4
Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp
View File

@ -65,7 +65,7 @@ plLoadAvatarMsg::plLoadAvatarMsg()
}
// CTOR uoidToClone, requestorKey, userData, isPlayer, spawnPOint, initialTask
plLoadAvatarMsg::plLoadAvatarMsg(const plUoid &uoidToClone, const plKey &requestorKey, UInt32 userData,
plLoadAvatarMsg::plLoadAvatarMsg(const plUoid &uoidToClone, const plKey &requestorKey, uint32_t userData,
hsBool isPlayer, const plKey &spawnPoint, plAvTask *initialTask, const char* userStr /*= nil*/)
: plLoadCloneMsg(uoidToClone, requestorKey, userData),
fIsPlayer(isPlayer),
@ -76,7 +76,7 @@ plLoadAvatarMsg::plLoadAvatarMsg(const plUoid &uoidToClone, const plKey &request
SetUserStr(userStr);
}
plLoadAvatarMsg::plLoadAvatarMsg(const plKey &existing, const plKey &requestor, UInt32 userData,
plLoadAvatarMsg::plLoadAvatarMsg(const plKey &existing, const plKey &requestor, uint32_t userData,
hsBool isPlayer, hsBool isLoading, const char* userStr /*= nil*/)
: plLoadCloneMsg(existing, requestor, userData, isLoading),
fIsPlayer(isPlayer),

4
Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h
View File

@ -82,7 +82,7 @@ public:
\param initialTask - queue up this task after loading (and spawning)
\param userStr - a string that the user can set
*/
plLoadAvatarMsg(const plUoid &uoidToClone, const plKey &requestorKey, UInt32 userData,
plLoadAvatarMsg(const plUoid &uoidToClone, const plKey &requestorKey, uint32_t userData,
hsBool isPlayer, const plKey &spawnPoint, plAvTask *initialTask, const char *userStr = nil);
/** Use this form if you're sending a message about an existing clone -- either
@ -96,7 +96,7 @@ public:
\param isLoading - Are we loading or unloading?
\param userStr - a string that the user can set
*/
plLoadAvatarMsg(const plKey &existing, const plKey &requestorKey, UInt32 userData,
plLoadAvatarMsg(const plKey &existing, const plKey &requestorKey, uint32_t userData,
hsBool isPlayer, hsBool isLoading, const char *userStr = nil);
virtual ~plLoadAvatarMsg();

10
Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp
View File

@ -65,7 +65,7 @@ plLoadCloneMsg::plLoadCloneMsg()
// CTOR uoidToClone, requestorKey, userData, isLoading
// this form is for creating new clones
plLoadCloneMsg::plLoadCloneMsg(const plUoid &uoidToClone, const plKey &requestorKey, UInt32 userData)
plLoadCloneMsg::plLoadCloneMsg(const plUoid &uoidToClone, const plKey &requestorKey, uint32_t userData)
: fRequestorKey(requestorKey),
fUserData(userData),
fValidMsg(false),
@ -99,7 +99,7 @@ plLoadCloneMsg::plLoadCloneMsg(const plUoid &uoidToClone, const plKey &requestor
// CTOR existing, requestor, userData, isLoading
// this form is for unloading or other operations on existing clones
plLoadCloneMsg::plLoadCloneMsg(const plKey &existing, const plKey &requestor, UInt32 userData, hsBool isLoading)
plLoadCloneMsg::plLoadCloneMsg(const plKey &existing, const plKey &requestor, uint32_t userData, hsBool isLoading)
: fCloneKey(existing),
fRequestorKey(requestor),
fUserData(userData),
@ -237,18 +237,18 @@ hsBool plLoadCloneMsg::IsValidMessage()
}
// GETUSERDATA
UInt32 plLoadCloneMsg::GetUserData()
uint32_t plLoadCloneMsg::GetUserData()
{
return fUserData;
}
// GETORIGINATINGPLAYERID
UInt32 plLoadCloneMsg::GetOriginatingPlayerID()
uint32_t plLoadCloneMsg::GetOriginatingPlayerID()
{
return fOriginatingPlayerID;
}
void plLoadCloneMsg::SetOriginatingPlayerID(UInt32 playerId)
void plLoadCloneMsg::SetOriginatingPlayerID(uint32_t playerId)
{
fOriginatingPlayerID = playerId;
}

14
Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h
View File

@ -80,7 +80,7 @@ public:
\param userData - Whatever you want. Will be propagated to the requestor after cloning.
*/
plLoadCloneMsg(const plUoid &uoidToClone, const plKey &requestorKey, UInt32 userData);
plLoadCloneMsg(const plUoid &uoidToClone, const plKey &requestorKey, uint32_t userData);
/** This constructor form is for when you want to send a clone message based on
an existing cloned object. The two primary uses of this are:
@ -92,7 +92,7 @@ public:
\param userData - Whatever you want. Will be propagated to the requestor.
\param isLoading - Are we loading or unloading?
*/
plLoadCloneMsg(const plKey &existing, const plKey &requestor, UInt32 userData, hsBool isLoading);
plLoadCloneMsg(const plKey &existing, const plKey &requestor, uint32_t userData, hsBool isLoading);
virtual ~plLoadCloneMsg();
@ -109,9 +109,9 @@ public:
plKey GetCloneKey();
plKey GetRequestorKey();
hsBool IsValidMessage();
UInt32 GetUserData();
UInt32 GetOriginatingPlayerID();
void SetOriginatingPlayerID(UInt32 playerId);
uint32_t GetUserData();
uint32_t GetOriginatingPlayerID();
void SetOriginatingPlayerID(uint32_t playerId);
hsBool GetIsLoading();
void SetTriggerMsg(plMessage *msg);
plMessage *GetTriggerMsg();
@ -121,8 +121,8 @@ protected:
plKey fCloneKey; // the key that will be loaded
plKey fRequestorKey; // forward the message to this guy after the clone is created
hsBool fValidMsg; // only gets set if the message built successfully
UInt32 fUserData; // let requestors send some data to their remote versions
UInt32 fOriginatingPlayerID; // network / player id of the client initiating the request
uint32_t fUserData; // let requestors send some data to their remote versions
uint32_t fOriginatingPlayerID; // network / player id of the client initiating the request
hsBool fIsLoading; // true if we're loading; false if we're unloading
plMessage *fTriggerMsg; // Handy place to store a message that caused you to request a clone,
// so you can see it and continue processing once your clone is loaded.

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

@ -55,7 +55,7 @@ public:
};
plMatRefMsg() {}
plMatRefMsg(const plKey &r, UInt8 flags, Int8 which, Int8 type) : plGenRefMsg(r, flags, which, type) {}
plMatRefMsg(const plKey &r, uint8_t flags, int8_t which, int8_t type) : plGenRefMsg(r, flags, which, type) {}
CLASSNAME_REGISTER( plMatRefMsg );
GETINTERFACE_ANY( plMatRefMsg, plGenRefMsg );

4
Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h
View File

@ -62,8 +62,8 @@ public:
CLASSNAME_REGISTER( plMeshRefMsg );
GETINTERFACE_ANY( plMeshRefMsg, plRefMsg );
UInt8 fType;
UInt8 fWhich;
uint8_t fType;
uint8_t fWhich;
// IO - not really applicable to ref msgs, but anyway
virtual void Read(hsStream* stream, hsResMgr* mgr)

10
Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h
View File

@ -87,12 +87,12 @@ protected:
char* fFileName;
UInt16 fCmd;
uint16_t fCmd;
hsTArray<plMessage*> fCallbacks;
public:
plMovieMsg(const char* n, UInt16 cmd)
plMovieMsg(const char* n, uint16_t cmd)
: plMessage(nil, nil, nil)
{
fFileName = hsStrcpy(n);
@ -130,8 +130,8 @@ public:
}
// Make sure you set at least one command, and set appropriate params for the command
UInt16 GetCmd() const { return fCmd; }
plMovieMsg& SetCmd(UInt16 c) { fCmd = c; return *this; }
uint16_t GetCmd() const { return fCmd; }
plMovieMsg& SetCmd(uint16_t c) { fCmd = c; return *this; }
// Center 0,0 is center of screen, 1,1 is Upper-Right, -1,-1 is Lower-Left, etc.
const hsPoint2& GetCenter() const { return fCenter; }
@ -186,7 +186,7 @@ public:
plMovieMsg& SetVolume(hsScalar v) { fVolume = v; return *this; }
plMovieMsg& AddCallback(plMessage* msg) { hsRefCnt_SafeRef(msg); fCallbacks.Append(msg); return *this; }
UInt32 GetNumCallbacks() const { return fCallbacks.GetCount(); }
uint32_t GetNumCallbacks() const { return fCallbacks.GetCount(); }
plMessage* GetCallback(int i) const { return fCallbacks[i]; }
virtual void Read(hsStream* s, hsResMgr* mgr) { hsAssert(false, "Not for I/O"); plMessage::IMsgRead(s, mgr); }

8
Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h
View File

@ -58,14 +58,14 @@ public:
kSetLoopCount,
};
UInt8 fStageNum;
UInt8 fNumLoops;
uint8_t fStageNum;
uint8_t fNumLoops;
plMultistageModMsg() : fStageNum(0), fNumLoops(1) {}
plMultistageModMsg(const plKey &sender, const plKey &receiver) : plMessage(sender,receiver,nil),fStageNum(0),fNumLoops(1) {}
hsBool GetCommand(UInt8 cmd) { return fCmds.IsBitSet(cmd); }
void SetCommand(UInt8 cmd, hsBool val = true) { fCmds.SetBit(cmd, val); }
hsBool GetCommand(uint8_t cmd) { return fCmds.IsBitSet(cmd); }
void SetCommand(uint8_t cmd, hsBool val = true) { fCmds.SetBit(cmd, val); }
// plasma protocol
CLASSNAME_REGISTER( plMultistageModMsg );

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

@ -100,7 +100,7 @@ public:
class plNetCommFileDownloadMsg : public plNetCommReplyMsg {
public:
wchar filename[MAX_PATH];
wchar_t filename[MAX_PATH];
hsStream * writer;
CLASSNAME_REGISTER(plNetCommFileDownloadMsg);

8
Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h
View File

@ -50,7 +50,7 @@ class plNetVoiceListMsg : public plMessage
{
protected:
hsTArray<UInt32> fClientIDs;
hsTArray<uint32_t> fClientIDs;
int fCmd;
plKey fRemoved;
@ -63,7 +63,7 @@ public:
};
plNetVoiceListMsg() : plMessage(nil, nil, nil), fCmd( 0 ) { SetBCastFlag(kBCastByExactType); }
plNetVoiceListMsg( UInt32 cmd ) :
plNetVoiceListMsg( uint32_t cmd ) :
plMessage(nil, nil, nil), fCmd( cmd )
{ SetBCastFlag( kBCastByExactType ); }
@ -72,8 +72,8 @@ public:
CLASSNAME_REGISTER( plNetVoiceListMsg );
GETINTERFACE_ANY( plNetVoiceListMsg, plMessage );
UInt32 GetCmd( void ) { return fCmd; }
hsTArray<UInt32>* GetClientList( void ) { return &fClientIDs; };
uint32_t GetCmd( void ) { return fCmd; }
hsTArray<uint32_t>* GetClientList( void ) { return &fClientIDs; };
plKey GetRemovedKey() { return fRemoved; }
void SetRemovedKey(plKey& k) { fRemoved = k; }
virtual void Read(hsStream* s, hsResMgr* mgr);

4
Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp
View File

@ -56,7 +56,7 @@ plOneShotCallbacks::~plOneShotCallbacks()
fCallbacks.clear();
}
void plOneShotCallbacks::AddCallback(const char *marker, plKey &receiver, Int16 user)
void plOneShotCallbacks::AddCallback(const char *marker, plKey &receiver, int16_t user)
{
fCallbacks.push_back(plOneShotCallback(hsStrcpy(marker), receiver, user));
}
@ -79,7 +79,7 @@ void plOneShotCallbacks::Read(hsStream* stream, hsResMgr* mgr)
{
char *marker = stream->ReadSafeString();
plKey receiver = mgr->ReadKey(stream);
Int16 user = stream->ReadLE16();
int16_t user = stream->ReadLE16();
fCallbacks.push_back(plOneShotCallback(marker, receiver, user));
}

6
Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h
View File

@ -59,12 +59,12 @@ public:
class plOneShotCallback
{
public:
plOneShotCallback(char *marker, plKey &receiver, Int16 user) :
plOneShotCallback(char *marker, plKey &receiver, int16_t user) :
fMarker(marker), fReceiver(receiver) , fUser(user) {}
char *fMarker;
plKey fReceiver;
Int16 fUser;
int16_t fUser;
};
protected:
@ -74,7 +74,7 @@ public:
plOneShotCallbacks();
~plOneShotCallbacks();
void AddCallback(const char *marker, plKey &receiver, Int16 user=0);
void AddCallback(const char *marker, plKey &receiver, int16_t user=0);
int GetNumCallbacks();
plOneShotCallback& GetCallback(int i);

18
Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h
View File

@ -56,7 +56,7 @@ class plParticleUpdateMsg : public plMessage
public:
plParticleUpdateMsg()
: plMessage(nil, nil, nil) {}
plParticleUpdateMsg(const plKey &s, const plKey &r, const double* t, UInt32 paramID, hsScalar paramValue )
plParticleUpdateMsg(const plKey &s, const plKey &r, const double* t, uint32_t paramID, hsScalar paramValue )
: plMessage(s, r, t) { fParamID = paramID; fParamValue = paramValue; }
virtual ~plParticleUpdateMsg() {}
@ -85,10 +85,10 @@ public:
kParamEnabled,
};
UInt32 fParamID;
uint32_t fParamID;
hsScalar fParamValue;
UInt32 GetParamID() { return fParamID; }
uint32_t GetParamID() { return fParamID; }
hsScalar GetParamValue() { return fParamValue; }
// IO
@ -118,10 +118,10 @@ class plParticleTransferMsg : public plMessage
{
public:
plKey fSysSOKey; // sceneObject of the system we're snagging particles from
UInt16 fNumToTransfer; // number of particles to transfer
uint16_t fNumToTransfer; // number of particles to transfer
plParticleTransferMsg() : plMessage(nil, nil, nil), fSysSOKey(nil), fNumToTransfer(0) {}
plParticleTransferMsg(const plKey &s, const plKey &r, const double* t, plKey sysSOKey, UInt16 numParticles )
plParticleTransferMsg(const plKey &s, const plKey &r, const double* t, plKey sysSOKey, uint16_t numParticles )
: plMessage(s, r, t) { fSysSOKey = sysSOKey; fNumToTransfer = numParticles; }
virtual ~plParticleTransferMsg() {}
@ -158,7 +158,7 @@ public:
hsScalar fNumToKill;
hsScalar fTimeLeft;
UInt8 fFlags;
uint8_t fFlags;
enum
{
kParticleKillImmortalOnly = 0x1, // Only slap a death sentence on "immortal" particles (the others are already dying)
@ -166,7 +166,7 @@ public:
};
plParticleKillMsg() : plMessage(nil, nil, nil), fNumToKill(0.f), fTimeLeft(0.f), fFlags(kParticleKillImmortalOnly) {}
plParticleKillMsg(const plKey &s, const plKey &r, const double* t, hsScalar numToKill, hsScalar timeLeft, UInt8 flags = kParticleKillImmortalOnly )
plParticleKillMsg(const plKey &s, const plKey &r, const double* t, hsScalar numToKill, hsScalar timeLeft, uint8_t flags = kParticleKillImmortalOnly )
: plMessage(s, r, t) { fNumToKill = numToKill; fTimeLeft = timeLeft; fFlags = flags; }
virtual ~plParticleKillMsg() {}
@ -197,7 +197,7 @@ class plParticleFlockMsg : public plMessage
{
public:
hsScalar fX, fY, fZ;
UInt8 fCmd;
uint8_t fCmd;
enum
{
kFlockCmdSetOffset,
@ -205,7 +205,7 @@ public:
};
plParticleFlockMsg() : plMessage(nil, nil, nil), fCmd(0), fX(0.f), fY(0.f), fZ(0.f) {}
plParticleFlockMsg(const plKey &s, const plKey &r, const double* t, UInt8 cmd, hsScalar x, hsScalar y, hsScalar z)
plParticleFlockMsg(const plKey &s, const plKey &r, const double* t, uint8_t cmd, hsScalar x, hsScalar y, hsScalar z)
: plMessage(s, r, t), fCmd(cmd), fX(x), fY(y), fZ(z) {}
virtual ~plParticleFlockMsg() {}

2
Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp
View File

@ -88,7 +88,7 @@ plRenderRequestAck::plRenderRequestAck()
hsAssert(false, "Improper usage, use argumented constructor");
}
plRenderRequestAck::plRenderRequestAck(plKey r, UInt32 userData)
plRenderRequestAck::plRenderRequestAck(plKey r, uint32_t userData)
: plMessage(nil, r, nil),
fUserData(userData)
{

10
Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h
View File

@ -92,19 +92,19 @@ public:
class plRenderRequestAck: public plMessage
{
protected:
UInt32 fUserData;
UInt32 fNumDrawn; // number of objects drawn.
uint32_t fUserData;
uint32_t fNumDrawn; // number of objects drawn.
public:
// Argumentless constructor useless (except for compiling).
plRenderRequestAck();
plRenderRequestAck(plKey r, UInt32 userData=0);
plRenderRequestAck(plKey r, uint32_t userData=0);
~plRenderRequestAck() {}
CLASSNAME_REGISTER( plRenderRequestAck );
GETINTERFACE_ANY( plRenderRequestAck, plMessage );
void SetNumDrawn(UInt32 n) { fNumDrawn = n; }
UInt32 GetNumDrawn() const { return fNumDrawn; }
void SetNumDrawn(uint32_t n) { fNumDrawn = n; }
uint32_t GetNumDrawn() const { return fNumDrawn; }
// These aren't really implemented. Read/Write/Transmission of
// these messages doesn't currently make sense.

4
Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h
View File

@ -53,7 +53,7 @@ class plReplaceGeometryMsg : public plMessage
public:
plSharedMesh *fMesh;
hsGMaterial *fMaterial;
UInt32 fFlags;
uint32_t fFlags;
plReplaceGeometryMsg() : fMesh(nil), fMaterial(nil), fFlags(0) {}
~plReplaceGeometryMsg() {}
@ -80,7 +80,7 @@ public:
plDrawableSpans *fSpans;
plSwapSpansRefMsg() : plGenRefMsg(), fSpans(nil) {}
plSwapSpansRefMsg(const plKey &r, UInt8 c, int which, int type) : plGenRefMsg(r, c, which, type) {}
plSwapSpansRefMsg(const plKey &r, uint8_t c, int which, int type) : plGenRefMsg(r, c, which, type) {}
~plSwapSpansRefMsg() {}
CLASSNAME_REGISTER( plSwapSpansRefMsg );

6
Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h
View File

@ -57,7 +57,7 @@ protected:
plResPageKeyRefList *fKeyList;
UInt8 fCommand;
uint8_t fCommand;
public:
@ -69,7 +69,7 @@ public:
kDisableDebugScreen
};
plResMgrHelperMsg( UInt8 command = 0 ) : plMessage(nil, nil, nil), fKeyList( nil ) { fCommand = command; }
plResMgrHelperMsg( uint8_t command = 0 ) : plMessage(nil, nil, nil), fKeyList( nil ) { fCommand = command; }
~plResMgrHelperMsg() { delete fKeyList; }
CLASSNAME_REGISTER( plResMgrHelperMsg );
@ -85,7 +85,7 @@ public:
hsAssert( false, "This should never get written" );
}
UInt8 GetCommand( void ) const { return fCommand; }
uint8_t GetCommand( void ) const { return fCommand; }
};
#endif // _plResMgrHelperMsg_h

6
Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h
View File

@ -57,7 +57,7 @@ class plRoomLoadNotifyMsg : public plMessage
{
protected:
plKey fRoomKey;
UInt8 fWhat;
uint8_t fWhat;
private:
void IInit()
@ -88,8 +88,8 @@ public:
virtual void SetRoom(plKey &rkey) { fRoomKey = rkey; }
virtual plKey GetRoom() { return fRoomKey; }
virtual void SetWhatHappen(UInt8 what) { fWhat = what; }
virtual UInt8 GetWhatHappen() { return fWhat; }
virtual void SetWhatHappen(uint8_t what) { fWhat = what; }
virtual uint8_t GetWhatHappen() { return fWhat; }
// IO
void Read(hsStream* stream, hsResMgr* mgr)

4
Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h
View File

@ -52,13 +52,13 @@ class plTimerCallbackMsg : public plMessage
public:
plTimerCallbackMsg(){;}
plTimerCallbackMsg(const plKey &s, const plKey &r, const double* t){;}
plTimerCallbackMsg(const plKey &r, UInt32 id = 0) { AddReceiver(r); fID = id;}
plTimerCallbackMsg(const plKey &r, uint32_t id = 0) { AddReceiver(r); fID = id;}
~plTimerCallbackMsg(){;}
CLASSNAME_REGISTER( plTimerCallbackMsg );
GETINTERFACE_ANY( plTimerCallbackMsg, plMessage );
UInt32 fID;
uint32_t fID;
hsScalar fTime;
virtual void Read(hsStream* stream, hsResMgr* mgr)

6
Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h
View File

@ -51,7 +51,7 @@ class plTransitionMsg : public plMessageWithCallbacks
{
protected:
UInt32 fEffect;
uint32_t fEffect;
hsScalar fLengthInSecs;
hsBool fHoldUntilNext;
public:
@ -64,7 +64,7 @@ public:
};
plTransitionMsg() : plMessageWithCallbacks(nil, nil, nil), fEffect( 0 ) { SetBCastFlag(kBCastByExactType); }
plTransitionMsg( UInt32 type, hsScalar lengthInSecs, hsBool holdUntilNext = false ) :
plTransitionMsg( uint32_t type, hsScalar lengthInSecs, hsBool holdUntilNext = false ) :
plMessageWithCallbacks(nil, nil, nil), fEffect( type ), fLengthInSecs( lengthInSecs ), fHoldUntilNext( holdUntilNext )
{ SetBCastFlag( kBCastByExactType ); }
@ -73,7 +73,7 @@ public:
CLASSNAME_REGISTER( plTransitionMsg );
GETINTERFACE_ANY( plTransitionMsg, plMessageWithCallbacks );
UInt32 GetEffect( void ) const { return fEffect; }
uint32_t GetEffect( void ) const { return fEffect; }
hsScalar GetLengthInSecs( void ) const { return fLengthInSecs; }
hsBool GetHoldState( void ) const { return fHoldUntilNext; }

12
Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h
View File

@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
class plVaultNotifyMsg : public plMessage
{
UInt16 fType;
uint16_t fType;
plCreatableListHelper fArgs;
Int8 fResultCode;
int8_t fResultCode;
public:
enum VaultNotifyTypes
@ -72,11 +72,11 @@ public:
CLASSNAME_REGISTER( plVaultNotifyMsg );
GETINTERFACE_ANY_AUX( plVaultNotifyMsg, plMessage, plCreatableListHelper, fArgs );
UInt16 GetType() const { return fType; }
void SetType( UInt16 v ) { fType=v; }
uint16_t GetType() const { return fType; }
void SetType( uint16_t v ) { fType=v; }
Int8 GetResultCode() const { return fResultCode; }
void SetResultCode( Int8 v ) { fResultCode=v; }
int8_t GetResultCode() const { return fResultCode; }
void SetResultCode( int8_t v ) { fResultCode=v; }
plCreatableListHelper * GetArgs() { return &fArgs; }
const plCreatableListHelper * GetArgs() const { return &fArgs; }