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

Alright, this _TEMP_CONVERT_ stuff was a stupid idea

Browse Source
This commit is contained in:
Michael Hansen
2012-11-13 01:02:23 -08:00
parent 075c535e2c
commit b219c3c3cc
97 changed files with 314 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
View File

@ -56,26 +56,6 @@ void plAnimCmdMsg::ClearCmd()
fCmd.Clear();
}
void plAnimCmdMsg::SetAnimName(const plString &name)
{
fAnimName = name;
}
plString plAnimCmdMsg::GetAnimName()
{
return fAnimName;
}
void plAnimCmdMsg::SetLoopName(const plString &name)
{
fLoopName = name;
}
plString plAnimCmdMsg::GetLoopName()
{
return fLoopName;
}
bool plAnimCmdMsg::CmdChangesAnimTime()
{
return (Cmd(kContinue) ||

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

@ -111,16 +111,12 @@ public:
bool Cmd(int n) const { return fCmd.IsBitSet(n); }
void SetCmd(int n) { fCmd.SetBit(n); }
void ClearCmd();
void SetAnimName(const plString &name);
plString GetAnimName();
void SetAnimName(const plString &name) { fAnimName = name; }
plString GetAnimName() { return fAnimName; }
bool CmdChangesAnimTime(); // Will this command cause an update to the current anim time?
// TEMP plString REVISIT
// Because I'm TOO LAZY to keep converting all these calls to SetAnimName
void SetAnimName(const char *name) { SetAnimName(_TEMP_CONVERT_FROM_LITERAL(name)); }
void SetLoopName(const plString &name);
plString GetLoopName();
void SetLoopName(const plString &name) { fLoopName = name; }
plString GetLoopName() { return fLoopName; }
float fBegin;
float fEnd;

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

@ -253,7 +253,7 @@ void plDynamicTextMsg::Write( hsStream *s, hsResMgr *mgr )
fClearColor.Write( s );
fColor.Write( s );
s->WriteSafeWString( fString );
s->WriteSafeWString( plString::FromWchar(fString) );
mgr->WriteKey( s, fImageKey );
s->WriteLE( fFlags );
@ -360,7 +360,7 @@ void plDynamicTextMsg::WriteVersion(hsStream* s, hsResMgr* mgr)
fColor.Write( s );
// kDynTextMsgString
s->WriteSafeWString( fString );
s->WriteSafeWString( plString::FromWchar(fString) );
// kDynTextMsgImageKey
mgr->WriteKey( s, fImageKey );

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

@ -59,13 +59,13 @@ class plDynamicTextMsg : public plMessage
friend class plDynamicTextMap;
protected:
uint16_t fCmd;
uint16_t fCmd;
// Position (fX is also used for font size)
int16_t fX, fY;
int16_t fX, fY;
// A rectangle
uint16_t fLeft, fTop, fRight, fBottom;
uint16_t fLeft, fTop, fRight, fBottom;
// Colors
hsColorRGBA fClearColor;
@ -78,10 +78,10 @@ protected:
plKey fImageKey;
// Misc flags field
uint32_t fFlags;
uint32_t fFlags;
bool fBlockRGB;
int16_t fLineSpacing;
int16_t fLineSpacing;
public:
plDynamicTextMsg() : plMessage( nil, nil, nil ) { fCmd = 0; fString = nil; fImageKey = nil; fFlags = 0; fBlockRGB = false; }