Changeset 7095 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 7, 2006, 5:36:27 PM (19 years ago)

Author:

bensch

Message:

should work now

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -252 +252 @@
 void SpaceShip::setAbsDirPlay(const Quaternion& quat)
 {
-  this->mouseDir = Quaternion(quat);
+  this->mouseDir = quat;
 }
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -123 +123 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setEnergyMax(1000);
-  this->increaseEnergy(1000);
+  this->setEnergyMax(100000);
+  this->increaseEnergy(100000);
   //this->minCharge = 2;
 

trunk/src/world_entities/world_entity.h

@@ -98 +98 @@
 
 protected:
-  void setHealth(float health) { this->health = health; };
+  void setHealth(float health) { this->health = health; this->updateHealthWidget();};
   void setHealthWidgetVisibilit(bool visibility);
   void setHealthMax(float healthMax);