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

plNPCSpawnMod => plString

Browse Source
This commit is contained in:
Michael Hansen
2014-01-09 23:07:49 -08:00
parent ee2ba7d068
commit b16274a8cc
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp
View File

@ -59,34 +59,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// plNPCSpawnMod ctor
plNPCSpawnMod::plNPCSpawnMod()
: fModelName(nil),
fAccountName(nil),
fAutoSpawn(false),
: fAutoSpawn(false),
fNotify(nil)
{
}
// plNPCSpawnMod ctor modelName accountName
plNPCSpawnMod::plNPCSpawnMod(const char * modelName, const char * accountName, bool autoSpawn)
plNPCSpawnMod::plNPCSpawnMod(const plString &modelName, const plString &accountName, bool autoSpawn)
: fAutoSpawn(autoSpawn), fNotify(nil)
{
fModelName = hsStrcpy(modelName);
fAccountName = hsStrcpy(accountName);
fModelName = modelName;
fAccountName = accountName;
}
// plNPCSpawnMod dtor
plNPCSpawnMod::~plNPCSpawnMod()
{
if(fModelName)
{
delete[] fModelName;
fModelName = nil;
}
if(fAccountName)
{
delete[] fAccountName;
fAccountName = nil;
}
if (fNotify)
fNotify->UnRef();
}
@ -108,7 +96,7 @@ bool plNPCSpawnMod::Trigger()
// will netpropagate
if(this->IsLocallyOwned())
{
if(fModelName)
if (!fModelName.IsEmpty())
{
// spawn the NPC
plKey spawnPoint = GetTarget(0)->GetKey();
@ -140,8 +128,8 @@ void plNPCSpawnMod::Read(hsStream *stream, hsResMgr *mgr)
{
plSingleModifier::Read(stream, mgr);
fModelName = stream->ReadSafeString();
fAccountName = stream->ReadSafeString();
fModelName = stream->ReadSafeString_TEMP();
fAccountName = stream->ReadSafeString_TEMP();
fAutoSpawn = stream->ReadBool();
if(stream->ReadBool())
fNotify = plNotifyMsg::ConvertNoRef(mgr->ReadCreatable(stream));
@ -188,4 +176,4 @@ void plNPCSpawnMod::ISendNotify(plKey &avatarKey)
} else {
hsStatusMessage("NPC Spawner is spawning but there is no notify message to send.");
}
}
}

6
Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.h
View File

@ -47,7 +47,7 @@ class plNPCSpawnMod : public plSingleModifier
{
public:
plNPCSpawnMod();
plNPCSpawnMod(const char * modelName, const char *accountName, bool autoSpawn);
plNPCSpawnMod(const plString &modelName, const plString &accountName, bool autoSpawn);
~plNPCSpawnMod();
bool Trigger();
@ -68,8 +68,8 @@ protected:
void ISendNotify(plKey &avatarKey); // send our notification message
private:
char *fModelName;
char *fAccountName;
plString fModelName;
plString fAccountName;
bool fAutoSpawn; // spawn immediately on loading
plKey fSpawnedKey; // if we want to be able to spawn many things, we should make this a vector
plNotifyMsg *fNotify; // notify message that we send when we spawn.