Changeset 3557 in orxonox.OLD for orxonox/branches/levelloader/src/lib/coord

Timestamp:

Mar 15, 2005, 10:53:46 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Rolling toward bug-free-ness

Location:

orxonox/branches/levelloader/src/lib/coord

Files:

• p_node.cc (modified) (5 diffs)
• p_node.h (modified) (1 diff)

orxonox/branches/levelloader/src/lib/coord/p_node.cc

@@ -40 +40 @@
   this->bAbsDirChanged = false;
   this->parent = NULL;
+  this->objectName = NULL;
 }
 
@@ -59 +60 @@
   this->bAbsDirChanged = false;
   this->parent = parent;
-
+  this->objectName = NULL;
+  
   parent->addChild (this);
 }
@@ -79 +81 @@
   */
   this->parent = NULL;
+  if( this->objectName) delete this->objectName;
   /* there is currently a problem with cleaning up - fix*/
 }
@@ -442 +445 @@
   \brief set the name of the node
 
+        \todo Error free assignment of name by copying the string instead of keeping just the pointer
+        
   for debug purposes realy usefull, not used to work properly
 */
-void PNode::setName (char* newName)
-{
-  this->objectName = newName;
+void PNode::setName (const char* newName)
+{
+        int l = strlen( newName);
+        
+        if( this->objectName != NULL) delete this->objectName;
+        this->objectName = NULL;
+        
+        if( newName != NULL)
+        {
+                this->objectName = new char[l+1];
+                
+                for( int i = 0; i < l+1; i++)
+                        this->objectName[i] = newName[i];
+        }
 }
 
@@ -453 +469 @@
   \brief gets the name of the node
 */
-char* PNode::getName ()
+const char* PNode::getName ()
 {
   return this->objectName;

orxonox/branches/levelloader/src/lib/coord/p_node.h

@@ -73 +73 @@
   virtual void tick (float dt);
 
-  void setName (char* newName);
-  char* getName ();
+  void setName (const char* newName);
+  const char* getName ();