Changeset 9059 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jul 3, 2006, 6:30:42 PM (19 years ago)

Author:

patrick

Message:

merged the network branche with the trunk

Location:

trunk/src/world_entities

Files:

• bsp_entity.cc (modified) (3 diffs)
• bsp_entity.h (modified) (2 diffs)
• player.h (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

trunk/src/world_entities/bsp_entity.cc

@@ -53 +53 @@
 
   this->bspManager = NULL;
-  /**
-   * @todo: Write CL_BSP_ENTITY INTO THE src/defs/class_id.h (your own definition)
-   */
+ 
+  this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name" ) );
+  
+  this->setSynchronized( true );
 }
 
@@ -62 +63 @@
 {
   PRINTF(0)("+++++++++++ LOADING NAME %s\n", name.c_str());
+  
+  this->name = name;
 
   // Check wether file exists....
@@ -130 +133 @@
 void BspEntity::collidesWith (WorldEntity* entity, const Vector& location)
 {}
+
+void BspEntity::varChangeHandler( std::list< int > & id )
+{
+  if ( std::find( id.begin(), id.end(), this->name_handle ) != id.end() )
+  {
+    this->setName( this->name_write );
+  }
+}

trunk/src/world_entities/bsp_entity.h

@@ -28 +28 @@
 
   void init();
+  
+  virtual void varChangeHandler( std::list<int> & id );
 
   virtual void draw() const;
@@ -38 +40 @@
  private:
    BspManager* bspManager;
+   
+   std::string name;                   //!< store name
+   std::string name_write;             //!< temp variable to store name
+   int name_handle;                    //!< handle for name
 
 };

trunk/src/world_entities/player.h

@@ -31 +31 @@
     bool              eject();
     inline Playable*  getPlayable() const  { return this->playable; };
+    
 
      inline Hud& hud() { return this->_hud; };

trunk/src/world_entities/world_entity.cc

@@ -738 +738 @@
   this->decreaseHealth(damage);
 
-  PRINTF(5)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)