Changeset 6547 in orxonox.OLD for trunk/src/world_entities/power_ups
- Timestamp:
- Jan 18, 2006, 2:12:53 PM (19 years ago)
- Location:
- trunk/src/world_entities/power_ups
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/power_ups/param_power_up.cc
r6512 r6547 32 32 33 33 const char* ParamPowerUp::paramTypes[] = { 34 "shield" 34 "shield", 35 "max-shield", 36 "health", 37 "max-health", 35 38 }; 36 39 … … 77 80 } 78 81 79 void ParamPowerUp::setValue( int value)82 void ParamPowerUp::setValue(float value) 80 83 { 81 84 this->value = value; … … 84 87 void ParamPowerUp::setType(const char* type) 85 88 { 86 for(int i = 0; i < P ARAM_size; ++i) {89 for(int i = 0; i < POWERUP_PARAM_size; ++i) { 87 90 if(strcmp(type, paramTypes[i]) == 0) { 88 91 this->type = (EnumParamPowerUpType)i; … … 92 95 } 93 96 94 void ParamPowerUp::setMaxValue( int value)97 void ParamPowerUp::setMaxValue(float value) 95 98 { 96 99 this->max_value = value; 97 100 } 98 101 99 void ParamPowerUp::setMinValue( int value)102 void ParamPowerUp::setMinValue(float value) 100 103 { 101 104 this->min_value = value; 102 105 } 103 106 104 int ParamPowerUp::getValue()107 float ParamPowerUp::getValue() 105 108 { 106 109 return this->value; … … 116 119 if(this->min_value != this->max_value) 117 120 { 118 value = this->min_value + (int)(rand() * (this->max_value - this->min_value));121 this->value = this->min_value + rand() * (this->max_value - this->min_value); 119 122 } 120 123 } … … 132 135 SYNCHELP_READ_INT( i ); 133 136 this->type = (EnumParamPowerUpType)i; 134 SYNCHELP_READ_ INT( this->value );137 SYNCHELP_READ_FLOAT( this->value ); 135 138 136 139 if ( this->value != 0 ) 137 140 { 138 SYNCHELP_READ_ INT( this->min_value );139 SYNCHELP_READ_ INT( this->max_value );141 SYNCHELP_READ_FLOAT( this->min_value ); 142 SYNCHELP_READ_FLOAT( this->max_value ); 140 143 respawn(); 141 144 } … … 165 168 int i = (int)this->type; 166 169 SYNCHELP_WRITE_INT( i ); 167 SYNCHELP_WRITE_ INT( this->value );170 SYNCHELP_WRITE_FLOAT( this->value ); 168 171 169 172 if ( this->value != 0 ) 170 173 { 171 SYNCHELP_WRITE_ INT( this->min_value );172 SYNCHELP_WRITE_ INT( this->max_value );174 SYNCHELP_WRITE_FLOAT( this->min_value ); 175 SYNCHELP_WRITE_FLOAT( this->max_value ); 173 176 } 174 177 -
trunk/src/world_entities/power_ups/param_power_up.h
r6512 r6547 12 12 13 13 typedef enum EnumParamPowerUpType { 14 PARAM_SHIELD, 15 PARAM_size 14 POWERUP_PARAM_SHIELD, 15 POWERUP_PARAM_MAX_SHIELD, 16 POWERUP_PARAM_HEALTH, 17 POWERUP_PARAM_MAX_HEALTH, 18 POWERUP_PARAM_size 16 19 } EnumParamPowerUpType; 17 20 … … 23 26 virtual ~ParamPowerUp (); 24 27 25 void setValue( int value);26 void setMaxValue( int value);27 void setMinValue( int value);28 void setValue(float value); 29 void setMaxValue(float value); 30 void setMinValue(float value); 28 31 void setType(const char* type); 29 32 EnumParamPowerUpType getType(); 30 int getValue();33 float getValue(); 31 34 32 35 virtual int writeBytes(const byte* data, int length, int sender); … … 43 46 static const char* paramTypes[]; 44 47 EnumParamPowerUpType type; 45 int value;46 int max_value;47 int min_value;48 float value; 49 float max_value; 50 float min_value; 48 51 }; 49 52 -
trunk/src/world_entities/power_ups/power_up.cc
r6512 r6547 65 65 void PowerUp::draw() const 66 66 { 67 glMatrixMode(GL_MODELVIEW); 67 this->sphereMaterial->select(); 68 WorldEntity::draw(); 69 /*glMatrixMode(GL_MODELVIEW); 68 70 glPushMatrix(); 69 71 70 /* translate */71 72 glTranslatef (this->getAbsCoor ().x, 72 73 this->getAbsCoor ().y, … … 78 79 this->getModel(0)->draw(); 79 80 80 glPopMatrix();81 glPopMatrix();*/ 81 82 } 82 83 -
trunk/src/world_entities/power_ups/weapon_power_up.cc
r6512 r6547 50 50 void WeaponPowerUp::init() 51 51 { 52 weaponXML = NULL; 53 weapon = NULL; 52 this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp"); 53 this->weaponXML = NULL; 54 this->weapon = NULL; 54 55 } 55 56
Note: See TracChangeset
for help on using the changeset viewer.