Changeset 10737 in orxonox.OLD for branches/presentation/src/world_entities/world_entity.h

Timestamp:

Jun 20, 2007, 6:17:06 PM (17 years ago)

Author:

nicolasc

Message:

collision fix

File:

• branches/presentation/src/world_entities/world_entity.h (modified) (4 diffs)

branches/presentation/src/world_entities/world_entity.h

@@ -226 +226 @@
   void setHealthRegen(float regen) { this->healthRegen = regen; };
   void createImplantWidget();
-    //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 
   void setShield(float shield) { this->shield = shield; };
@@ -238 +237 @@
   void setElectronicTH(float th) { this->electronicTH = th; };
   void setElectronicRegen(float regen) { this->electronicRegen = regen; };
-  
+
   void setDamageable( bool damageable ){ this->damageable = damageable; }
   bool getDamageable(){ return this->damageable; }
@@ -270 +269 @@
   bool                    forwardDamageToParent;  //!< if true, damage taken will be forwardet to parent
   float                   healthMax;              //!< The Maximal energy this entity can take. 
-  float                                         implantEnergy;          //!< energy of implants
-  float                   healthRegen;        //!< Regeneration Rate of Health, mesured in units per second
+  float                   implantEnergy;          //!< energy of implants
+  float                   healthRegen;            //!< Regeneration Rate of Health, mesured in units per second
   OrxGui::GLGuiEnergyWidgetVertical* healthWidget;    //!< The Slider (if wanted).
-  OrxGui::GLGuiEnergyWidgetVertical* implantWidget; 
+  OrxGui::GLGuiEnergyWidgetVertical* implantWidget;
 
   float       shield;             //!< current shield
@@ -324 +323 @@
   float                   healthMax_write;
   int                     healthMax_handle;
-  
+