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

Fix winmain use and a couple of remaining SafeStrings => plString

Browse Source
This commit is contained in:
Michael Hansen
2014-01-12 17:59:20 -08:00
parent ae1bbdc1d6
commit f1131bbb25
4 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -872,7 +872,7 @@ static void LoadUserPass (LoginDialogParam *pLoginParam)
ZeroMemory(cryptKey, sizeof(cryptKey));
GetCryptKey(cryptKey, arrsize(cryptKey));
char* temp;
plString temp;
pLoginParam->remember = false;
pLoginParam->username[0] = '\0';
@ -891,12 +891,11 @@ static void LoadUserPass (LoginDialogParam *pLoginParam)
if (memcmp(cryptKey, savedKey, sizeof(savedKey)) == 0)
{
temp = stream->ReadSafeString();
temp = stream->ReadSafeString_TEMP();
if (temp)
if (!temp.IsEmpty())
{
StrCopy(pLoginParam->username, temp, kMaxAccountNameLength);
delete[] temp;
StrCopy(pLoginParam->username, temp.c_str(), kMaxAccountNameLength);
}
pLoginParam->remember = stream->ReadBool();

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

@ -236,7 +236,7 @@ void plAvSeekMsg::Read(hsStream *stream, hsResMgr *mgr)
fDuration = stream->ReadLEScalar();
fSmartSeek = stream->ReadBool();
fAnimName = stream->ReadSafeString();
fAnimName = stream->ReadSafeString_TEMP();
fAlignType = static_cast<plAvAlignment>(stream->ReadLE16());
fNoSeek = stream->ReadBool();
fFlags = stream->ReadByte();

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

@ -53,20 +53,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//
// plLinkToAgeMsg
plLinkToAgeMsg::plLinkToAgeMsg() : fLinkInAnimName(nil), fFlags(0)
plLinkToAgeMsg::plLinkToAgeMsg() : fFlags(0)
{
}
plLinkToAgeMsg::plLinkToAgeMsg( const plAgeLinkStruct * link ) : fLinkInAnimName(nil), fFlags(0)
plLinkToAgeMsg::plLinkToAgeMsg( const plAgeLinkStruct * link ) : fFlags(0)
{
fAgeLink.CopyFrom( link );
}
plLinkToAgeMsg::~plLinkToAgeMsg()
{
delete [] fLinkInAnimName;
}
void plLinkToAgeMsg::PlayLinkSfx(bool linkIn, bool linkOut)
{
if (linkIn)
@ -84,7 +79,7 @@ void plLinkToAgeMsg::Read(hsStream* stream, hsResMgr* mgr)
plMessage::IMsgRead( stream, mgr );
fFlags = stream->ReadByte();
fAgeLink.Read( stream, mgr );
fLinkInAnimName = stream->ReadSafeString();
fLinkInAnimName = stream->ReadSafeString_TEMP();
}
void plLinkToAgeMsg::Write(hsStream* stream, hsResMgr* mgr)
@ -111,7 +106,7 @@ void plLinkToAgeMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
if ( contentFlags.IsBitSet( kLinkToAgeAgeLinkStruct ) )
fAgeLink.Read( s, mgr );
if ( contentFlags.IsBitSet( kLinkToAgeLinkAnimName ) )
fLinkInAnimName = s->ReadSafeString();
fLinkInAnimName = s->ReadSafeString_TEMP();
}
void plLinkToAgeMsg::WriteVersion(hsStream* s, hsResMgr* mgr)

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

@ -66,12 +66,11 @@ class plLinkToAgeMsg : public plMessage
uint8_t fFlags;
plAgeLinkStruct fAgeLink;
char* fLinkInAnimName;
plString fLinkInAnimName;
public:
plLinkToAgeMsg();
plLinkToAgeMsg( const plAgeLinkStruct * link );
virtual ~plLinkToAgeMsg();
CLASSNAME_REGISTER( plLinkToAgeMsg );
GETINTERFACE_ANY( plLinkToAgeMsg, plMessage );
@ -83,8 +82,8 @@ public:
bool PlayLinkInSfx() const { return (fFlags & kMuteLinkInSfx) == 0; }
bool PlayLinkOutSfx() const { return (fFlags & kMuteLinkOutSfx) == 0; }
const char * GetLinkInAnimName() { return fLinkInAnimName; }
void SetLinkInAnimName(const char* name) { delete [] fLinkInAnimName; fLinkInAnimName = hsStrcpy(name); }
plString GetLinkInAnimName() { return fLinkInAnimName; }
void SetLinkInAnimName(const plString& name) { fLinkInAnimName = name; }
void Read(hsStream* stream, hsResMgr* mgr);
void Write(hsStream* stream, hsResMgr* mgr);