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

plArmatureMod => plString

Browse Source
This commit is contained in:
Michael Hansen
2014-01-12 13:22:42 -08:00
parent 0c1783b2f3
commit ff30c77ddd
5 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
View File

@ -1743,8 +1743,8 @@ void plArmatureMod::Write(hsStream *stream, hsResMgr *mgr)
stream->WriteLEFloat(fPhysWidth);
stream->WriteSafeString(fAnimationPrefix);
stream->WriteSafeString(fBodyAgeName.c_str());
stream->WriteSafeString(fBodyFootstepSoundPage.c_str());
stream->WriteSafeString(fBodyAgeName);
stream->WriteSafeString(fBodyFootstepSoundPage);
}
void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
@ -1780,9 +1780,7 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
// Attach the Footstep emitter scene object
hsResMgr *mgr = hsgResMgr::ResMgr();
const char *age = fBodyAgeName.c_str();
const char *page = fBodyFootstepSoundPage.c_str();
const plLocation &gLoc = plKeyFinder::Instance().FindLocation(age, page);
const plLocation &gLoc = plKeyFinder::Instance().FindLocation(fBodyAgeName, fBodyFootstepSoundPage);
if (gLoc.IsValid())
{
@ -1824,15 +1822,9 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
fPhysWidth = stream->ReadLEFloat();
fAnimationPrefix = stream->ReadSafeString_TEMP();
fBodyAgeName = stream->ReadSafeString_TEMP();
fBodyFootstepSoundPage = stream->ReadSafeString_TEMP();
char *temp = stream->ReadSafeString();
fBodyAgeName = temp;
delete [] temp;
temp = stream->ReadSafeString();
fBodyFootstepSoundPage = temp;
delete [] temp;
plgDispatch::Dispatch()->RegisterForExactType(plAvatarStealthModeMsg::Index(), GetKey());
}
@ -2561,9 +2553,9 @@ int plArmatureMod::GetKILevel()
return VaultGetKILevel();
}
void plArmatureMod::SetLinkInAnim(const char *animName)
void plArmatureMod::SetLinkInAnim(const plString &animName)
{
if (animName)
if (!animName.IsNull())
{
plAGAnim *anim = FindCustomAnim(animName);
fLinkInAnimKey = (anim ? anim->GetKey() : nil);

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

@ -340,7 +340,7 @@ public:
bool IsKILowestLevel();
int GetKILevel();
void SetLinkInAnim(const char *animName);
void SetLinkInAnim(const plString &animName);
plKey GetLinkInAnimKey() const;
enum
@ -369,11 +369,11 @@ public:
void SetPhysicalDims(float height, float width) { fPhysHeight = height; fPhysWidth = width; }
void SetBodyAgeName(const char* ageName) {if (ageName) fBodyAgeName = ageName; else fBodyAgeName = "";}
void SetBodyFootstepSoundPage(const char* pageName) {if (pageName) fBodyFootstepSoundPage = pageName; else fBodyFootstepSoundPage = "";}
void SetBodyAgeName(const plString& ageName) { fBodyAgeName = ageName; }
void SetBodyFootstepSoundPage(const plString& pageName) { fBodyFootstepSoundPage = pageName; }
void SetAnimationPrefix(const plString& prefix) { fAnimationPrefix = prefix; }
const char* GetUserStr() {return fUserStr.c_str();}
plString GetUserStr() const { return fUserStr; }
protected:
void IInitDefaults();
@ -443,12 +443,12 @@ protected:
bool fDontPanicLink;
// strings for animations, age names, footstep sounds, etc
std::string fBodyAgeName;
std::string fBodyFootstepSoundPage;
plString fBodyAgeName;
plString fBodyFootstepSoundPage;
plString fAnimationPrefix;
// user-defined string assigned to this avatar
std::string fUserStr;
plString fUserStr;
};
// PLARMATURELOD