Changeset 6815 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Jan 28, 2006, 5:11:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

Location:

trunk/src/world_entities/power_ups

Files:

• laser_power_up.cc (modified) (2 diffs)
• param_power_up.cc (modified) (2 diffs)
• power_up.cc (modified) (3 diffs)
• turret_power_up.cc (modified) (2 diffs)
• weapon_power_up.cc (modified) (2 diffs)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -127 +127 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_LPU_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -149 +149 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_LPU_WE_STATE );
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -131 +131 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_PPU_WE_STATE );
 
   int i;
-  SYNCHELP_READ_INT( i );
+  SYNCHELP_READ_INT( i, NWT_PPU_TYPE );
   this->type = (EnumParamPowerUpType)i;
-  SYNCHELP_READ_FLOAT( this->value );
+  SYNCHELP_READ_FLOAT( this->value, NWT_PPU_VALUE );
 
   if ( this->value != 0 )
   {
-    SYNCHELP_READ_FLOAT( this->min_value );
-    SYNCHELP_READ_FLOAT( this->max_value );
+    SYNCHELP_READ_FLOAT( this->min_value, NWT_PPU_MINVALUE );
+    SYNCHELP_READ_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
     respawn();
   }
@@ -165 +165 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_PPU_WE_STATE );
 
     int i = (int)this->type;
-    SYNCHELP_WRITE_INT( i );
-    SYNCHELP_WRITE_FLOAT( this->value );
+    SYNCHELP_WRITE_INT( i, NWT_PPU_TYPE );
+    SYNCHELP_WRITE_FLOAT( this->value, NWT_PPU_VALUE );
 
     if ( this->value != 0 )
     {
-      SYNCHELP_WRITE_FLOAT( this->min_value );
-      SYNCHELP_WRITE_FLOAT( this->max_value );
+      SYNCHELP_WRITE_FLOAT( this->min_value, NWT_PPU_MINVALUE );
+      SYNCHELP_WRITE_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
     }
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -20 +20 @@
 #include "extendable.h"
 #include "primitive_model.h"
+
+#include "assert.h"
 
 using namespace std;
@@ -124 +126 @@
 {
   SYNCHELP_WRITE_BEGIN();
-  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_PU_WE_STATE );
   return SYNCHELP_WRITE_N;
 }
@@ -138 +140 @@
 {
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_PU_WE_STATE );
   return SYNCHELP_READ_N;
 }

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -136 +136 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_TPU_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -157 +157 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_TPU_WE_STATE );
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -100 +100 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_WPU_WE_STATE );
 
   //TODO: sync weapon class ( see loadParams )
@@ -124 +124 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_WPU_WE_STATE );
 
     //TODO: sync weapon class ( see loadParams )