From 611b9a09c2e0b8eca2685181a44f20367e9d52f7 Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Thu, 9 Jan 2014 20:36:46 -0800
Subject: [PATCH] plCloneSpawnModifier template name => plString

---
 .../plModifier/plCloneSpawnModifier.cpp          | 16 ++--------------
 .../PubUtilLib/plModifier/plCloneSpawnModifier.h |  5 ++---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp
index cf04761e..540b391b 100644
--- a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp
+++ b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.cpp
@@ -53,19 +53,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnMessage/plNodeRefMsg.h"
 #include "plMessage/plLoadCloneMsg.h"
 
-plCloneSpawnModifier::plCloneSpawnModifier() : fTemplateName(nil), fExportTime(false)
+plCloneSpawnModifier::plCloneSpawnModifier() : fExportTime(false)
 {
 }
 
-plCloneSpawnModifier::~plCloneSpawnModifier()
-{
-    delete [] fTemplateName;
-}
-
 void plCloneSpawnModifier::Read(hsStream *s, hsResMgr *mgr)
 {
-    delete [] fTemplateName;
-    fTemplateName = s->ReadSafeString();
+    fTemplateName = s->ReadSafeString_TEMP();
     plSingleModifier::Read(s, mgr);
 }
 
@@ -75,12 +69,6 @@ void plCloneSpawnModifier::Write(hsStream *s, hsResMgr *mgr)
     plSingleModifier::Write(s, mgr);
 }
 
-void plCloneSpawnModifier::SetTemplateName(const char *templateName)
-{
-    delete [] fTemplateName;
-    fTemplateName = hsStrcpy(templateName);
-}
-
 void plCloneSpawnModifier::SetTarget(plSceneObject* so)
 {
     fTarget = so;
diff --git a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h
index b77261f4..d0fc91a6 100644
--- a/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h
+++ b/Sources/Plasma/PubUtilLib/plModifier/plCloneSpawnModifier.h
@@ -47,14 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 class plCloneSpawnModifier : public plSingleModifier
 {
 protected:
-    char* fTemplateName;
+    plString fTemplateName;
     bool fExportTime;
 
     virtual bool IEval(double secs, float del, uint32_t dirty) { return true; }
 
 public:
     plCloneSpawnModifier();
-    ~plCloneSpawnModifier();
 
     CLASSNAME_REGISTER(plCloneSpawnModifier);
     GETINTERFACE_ANY(plCloneSpawnModifier, plSingleModifier);
@@ -64,7 +63,7 @@ public:
 
     virtual void SetTarget(plSceneObject* so);
 
-    void SetTemplateName(const char *templateName);
+    void SetTemplateName(const plString &templateName) { fTemplateName = templateName; }
 
     // Set this to true at export time so the clone mod won't try to make a
     // clone when it's attached