Changeset 9921 in orxonox.OLD for branches/network/src/lib

Timestamp:

Nov 9, 2006, 2:46:12 PM (18 years ago)

Author:

rennerc

Message:

spectator spawns fpsplayer on space key

Location:

branches/network/src/lib

Files:

• graphics/importer/md2/md2Model.cc (modified) (2 diffs)
• lang/base_object.cc (modified) (1 diff)

branches/network/src/lib/graphics/importer/md2/md2Model.cc

@@ -99 +99 @@
 {
   this->init();
+  
+  this->scaleFactor = model.scaleFactor;
+  
   this->rebuildInfo();
 }
@@ -104 +107 @@
 MD2Model& MD2Model::operator=(const MD2Model& md2model)
 {
+  this->init();
+  this->scaleFactor = md2model.scaleFactor;
   this->data = md2model.data;
   this->rebuildInfo();

branches/network/src/lib/lang/base_object.cc

@@ -42 +42 @@
 {
   this->className = "BaseObject";
-  this->objectName = "";
-  this->xmlElem = NULL;
+  this->objectName = bo.objectName;
+  this->xmlElem = (bo.xmlElem)? bo.xmlElem->Clone() : NULL;
   this->registerObject( this, BaseObject::_objectList);
 }