Changeset 7954 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

May 29, 2006, 3:28:41 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

Location:

trunk/src/world_entities/npcs

Files:

• ground_turret.cc (modified) (1 diff)
• ground_turret.h (modified) (1 diff)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -180 +180 @@
   Explosion::explode(this, Vector(10,10,10));
 }
-
-/**
- * Writes data from network containing information about the state
- * @param data pointer to data
- * @param length length of data
- * @param sender hostID of sender
- */
-int GroundTurret::writeBytes( const byte * data, int length, int sender )
-{
-  setRequestedSync( false );
-  setIsOutOfSync( false );
-
-  SYNCHELP_READ_BEGIN();
-
-  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_GT_WE_STATE );
-
-  return SYNCHELP_READ_N;
-}
-
-/**
- * data copied in data will bee sent to another host
- * @param data pointer to data
- * @param maxLength max length of data
- * @return the number of bytes writen
- */
-int GroundTurret::readBytes( byte * data, int maxLength, int * reciever )
-{
-  SYNCHELP_WRITE_BEGIN();
-
-  if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
-  {
-    (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
-    setRequestedSync( true );
-  }
-
-  int rec = this->getRequestSync();
-  if ( rec > 0 )
-  {
-    *reciever = rec;
-
-    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_GT_WE_STATE );
-
-  }
-
-  *reciever = 0;
-  return SYNCHELP_WRITE_N;
-}

trunk/src/world_entities/npcs/ground_turret.h

@@ -30 +30 @@
   virtual void tick(float time);
 
-  virtual int writeBytes(const byte* data, int length, int sender);
-  virtual int readBytes(byte* data, int maxLength, int * reciever);
-
  private:
    PNode  weaponHolder[2];