Changeset 10675 in orxonox.OLD

Timestamp:

Jun 7, 2007, 2:28:59 PM (17 years ago)

Author:

nicolasc

Message:

xfer

Location:

branches/vs-enhencements/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (2 diffs)
• world_entity.h (modified) (2 diffs)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -296 +296 @@
   this->toList(OM_GROUP_00);
 
-//   if ( this->hasPlayer() ){
-//     State::getPlayer()->hud().setShieldWidget(this->getShieldWidget());
-//     State::getPlayer()->hud().setEnergyWidget(this->getElectronicWidget());
-//   }
+
+  dynamic_cast<WorldEntity*>(this)->createHealthWidget();
+  dynamic_cast<WorldEntity*>(this)->createShieldWidget();
+  dynamic_cast<WorldEntity*>(this)->createElectronicWidget();
+
+  if ( this->hasPlayer() ){
+    State::getPlayer()->hud().setShieldWidget(this->getShieldWidget());
+    State::getPlayer()->hud().setEnergyWidget(this->getElectronicWidget());
+  }
 }
 
@@ -309 +314 @@
 void SpaceShip::loadParams(const TiXmlElement* root)
 {
+  if(!root)
+    return;
+
   Playable::loadParams(root);
 

branches/vs-enhencements/src/world_entities/world_entity.h

@@ -182 +182 @@
   void resetHealth() { this->health = this->healthMax; };
 
+  void createHealthWidget();
+  void createShieldWidget();
+  void createElectronicWidget();
 
   void regen(float time);
@@ -218 +221 @@
   void setHealthWidgetVisibility(bool visibility);
   void setHealthMax(float healthMax);
-  void createHealthWidget();
-  void createShieldWidget();
-  void createElectronicWidget();
+//   void createHealthWidget();
+//   void createShieldWidget();
+//   void createElectronicWidget();
   void setHealthRegen(float regen) { this->healthRegen = regen; };
     //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity