Changeset 6420 in orxonox.OLD

Timestamp:

Jan 6, 2006, 6:41:59 PM (18 years ago)

Author:

rennerc

Message:

tried to place ParamPowerUp

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (1 diff)
• world_entities/power_ups/param_power_up.cc (modified) (2 diffs)
• world_entities/power_ups/param_power_up.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)

branches/network/src/lib/network/network_game_manager.cc

@@ -734 +734 @@
   }
 
-  PNode::getNullParent()->debugNode( 0 );
-
   return true;
 }

branches/network/src/world_entities/power_ups/param_power_up.cc

@@ -25 +25 @@
 #include "factory.h"
 #include "load_param.h"
+#include "network_game_manager.h"
 
 using namespace std;
@@ -119 +120 @@
 }
 
+int ParamPowerUp::writeBytes( const byte * data, int length, int sender )
+{
+  setRequestedSync( false );
+  setIsOutOfSync( false );
 
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( PowerUp::writeState );
+
+  return SYNCHELP_READ_N;
+}
+
+
+
+int ParamPowerUp::readBytes( byte * data, int maxLength, int * reciever )
+{
+  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_BEGIN();
+
+    SYNCHELP_WRITE_FKT( PowerUp::readState );
+
+    return SYNCHELP_WRITE_N;
+  }
+
+  *reciever = 0;
+  return 0;
+}
+

branches/network/src/world_entities/power_ups/param_power_up.h

@@ -30 +30 @@
   int getValue();
 
+  virtual int writeBytes(const byte* data, int length, int sender);
+  virtual int readBytes(byte* data, int maxLength, int * reciever );
+
 protected:
   virtual void respawn();

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -31 +31 @@
 #include "key_mapper.h"
 #include "event_handler.h"
+
+#include "network_game_manager.h"
 
 #include "power_ups/weapon_power_up.h"
@@ -516 +518 @@
   }
 }
+
+
+int SpaceShip::writeBytes( const byte * data, int length, int sender )
+{
+  setRequestedSync( false );
+  setIsOutOfSync( false );
+
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_FKT( WorldEntity::writeState );
+
+  return SYNCHELP_READ_N;
+}
+
+int SpaceShip::readBytes( byte * data, int maxLength, int * reciever )
+{
+  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_BEGIN();
+
+    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+
+    return SYNCHELP_WRITE_N;
+  }
+
+  *reciever = 0;
+  return 0;
+}

branches/network/src/world_entities/space_ships/space_ship.h

@@ -44 +44 @@
     bool pickup(PowerUp* powerUp);
 
+    virtual int       writeBytes(const byte* data, int length, int sender);
+    virtual int       readBytes(byte* data, int maxLength, int * reciever);
+
 
   private:

branches/network/src/world_entities/terrain.cc

@@ -327 +327 @@
   SYNCHELP_READ_FKT( WorldEntity::writeState );
 
-  PNode::getNullParent()->debugNode( 0 );
-
   return SYNCHELP_READ_N;
 }