Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/lang

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

Location:

orxonox/branches/levelloader/src/lib/lang

Files:

• base_object.cc (modified) (2 diffs)
• base_object.h (modified) (1 diff)

orxonox/branches/levelloader/src/lib/lang/base_object.cc

@@ -26 +26 @@
    \brief standard constructor
 */
-BaseObject::BaseObject () {}
+BaseObject::BaseObject () 
+{
+  this->className = NULL;
+}
 
 
@@ -32 +35 @@
    \brief standard deconstructor
 */
-BaseObject::~BaseObject () {}
-
+BaseObject::~BaseObject () 
+{
+  delete []this->className;
+}
 
 void BaseObject::setClassName (char* className)
 {
-  this->className = className;
+  this->className = new char[strlen(className)+1];
+  strcpy(this->className, className);
 }
 

orxonox/branches/levelloader/src/lib/lang/base_object.h

@@ -15 +15 @@
  public:
   BaseObject ();
-  ~BaseObject ();
+  virtual ~BaseObject ();
 
   void setClassName (char* className);