Changeset 6547 in orxonox.OLD for trunk/src/world_entities/power_ups/param_power_up.cc

Timestamp:

Jan 18, 2006, 2:12:53 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WeaponManager back to the trunk

File:

• trunk/src/world_entities/power_ups/param_power_up.cc (modified) (7 diffs)

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -32 +32 @@
 
 const char* ParamPowerUp::paramTypes[] = {
-  "shield"
+  "shield",
+  "max-shield",
+  "health",
+  "max-health",
 };
 
@@ -77 +80 @@
 }
 
-void ParamPowerUp::setValue(int value)
+void ParamPowerUp::setValue(float value)
 {
   this->value = value;
@@ -84 +87 @@
 void ParamPowerUp::setType(const char* type)
 {
-  for(int i = 0; i < PARAM_size; ++i) {
+  for(int i = 0; i < POWERUP_PARAM_size; ++i) {
     if(strcmp(type, paramTypes[i]) == 0) {
       this->type = (EnumParamPowerUpType)i;
@@ -92 +95 @@
 }
 
-void ParamPowerUp::setMaxValue(int value)
+void ParamPowerUp::setMaxValue(float value)
 {
   this->max_value = value;
 }
 
-void ParamPowerUp::setMinValue(int value)
+void ParamPowerUp::setMinValue(float value)
 {
   this->min_value = value;
 }
 
-int ParamPowerUp::getValue()
+float ParamPowerUp::getValue()
 {
   return this->value;
@@ -116 +119 @@
   if(this->min_value != this->max_value)
   {
-    value = this->min_value + (int)(rand() * (this->max_value - this->min_value));
+    this->value = this->min_value + rand() * (this->max_value - this->min_value);
   }
 }
@@ -132 +135 @@
   SYNCHELP_READ_INT( i );
   this->type = (EnumParamPowerUpType)i;
-  SYNCHELP_READ_INT( this->value );
+  SYNCHELP_READ_FLOAT( this->value );
 
   if ( this->value != 0 )
   {
-    SYNCHELP_READ_INT( this->min_value );
-    SYNCHELP_READ_INT( this->max_value );
+    SYNCHELP_READ_FLOAT( this->min_value );
+    SYNCHELP_READ_FLOAT( this->max_value );
     respawn();
   }
@@ -165 +168 @@
     int i = (int)this->type;
     SYNCHELP_WRITE_INT( i );
-    SYNCHELP_WRITE_INT( this->value );
+    SYNCHELP_WRITE_FLOAT( this->value );
 
     if ( this->value != 0 )
     {
-      SYNCHELP_WRITE_INT( this->min_value );
-      SYNCHELP_WRITE_INT( this->max_value );
+      SYNCHELP_WRITE_FLOAT( this->min_value );
+      SYNCHELP_WRITE_FLOAT( this->max_value );
     }