From ff30c77ddd45d4588f98309a719e394ab61ca190 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 12 Jan 2014 13:22:42 -0800 Subject: [PATCH] plArmatureMod => plString --- Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp | 2 +- .../PubUtilLib/plAvatar/plArmatureMod.cpp | 22 ++++++------------- .../PubUtilLib/plAvatar/plArmatureMod.h | 14 ++++++------ .../Plasma/PubUtilLib/plMessage/plAIMsg.cpp | 7 ++---- Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h | 6 ++--- 5 files changed, 20 insertions(+), 31 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp index d3c06252..72a674b0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -2919,7 +2919,7 @@ PyObject* cyMisc::GetAIAvatarsByModelName(const char* name) { PyObject* tuple = PyTuple_New(2); PyTuple_SetItem(tuple, 0, pyCritterBrain::New(critterBrain)); - PyTuple_SetItem(tuple, 1, PyString_FromString(armMod->GetUserStr())); + PyTuple_SetItem(tuple, 1, PyString_FromPlString(armMod->GetUserStr())); PyList_Append(avList, tuple); Py_DECREF(tuple); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp index 607532d1..3921d58f 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp @@ -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); diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h index c9ed070d..9b9e9bc0 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.h @@ -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 diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp index e71be044..54caa80f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp @@ -68,17 +68,14 @@ void plAIMsg::Read(hsStream* stream, hsResMgr* mgr) { plMessage::IMsgRead(stream, mgr); - char* temp = stream->ReadSafeString(); - if (temp) - fBrainUserStr = temp; - delete [] temp; + fBrainUserStr = stream->ReadSafeString_TEMP(); } void plAIMsg::Write(hsStream* stream, hsResMgr* mgr) { plMessage::IMsgWrite(stream, mgr); - stream->WriteSafeString(fBrainUserStr.c_str()); + stream->WriteSafeString(fBrainUserStr); } /////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h index 96af1fba..16689301 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h @@ -63,8 +63,8 @@ public: virtual void Read(hsStream* stream, hsResMgr* mgr); virtual void Write(hsStream* stream, hsResMgr* mgr); - void BrainUserString(const std::string& userStr) {fBrainUserStr = userStr;} - std::string BrainUserString() const {return fBrainUserStr;} + void BrainUserString(const plString& userStr) {fBrainUserStr = userStr;} + plString BrainUserString() const {return fBrainUserStr;} // enum for all messages to make things easier for people that use us enum @@ -75,7 +75,7 @@ public: }; private: - std::string fBrainUserStr; + plString fBrainUserStr; }; // message spammed to anyone listening so they can grab the brain's key and talk to it