Changeset 10814 for code/branches/fabienHS15/src/orxonox

Timestamp:

Nov 17, 2015, 10:30:24 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• infos/PlayerInfo.cc (modified) (2 diffs)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h

@@ -167 +167 @@
     class DefaultWeaponmodeLink;
     class Munition;
+    class ReplenishingMunition;
     class Weapon;
     class WeaponMode;

code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc

@@ -202 +202 @@
 
         this->changedControllableEntity();
+
+         // HACK-ish
+        if(this->isHumanPlayer())
+            entity->createHud();
     }
 
@@ -252 +256 @@
         if( !entity || this->previousControllableEntity_.size() == 0 )
             return;
+
+        entity->destroyHud(); // HACK-ish
 
         this->controllableEntity_->setController(0);

code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -143 +143 @@
         XMLPortObject(Pawn, Munition, "munition", addMunitionXML, getMunitionXML, xmlelement, mode);
 
-        XMLPortParam(Pawn, "reloadrate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
-        XMLPortParam(Pawn, "reloadwaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
+        XMLPortParam(Pawn, "shieldrechargerate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
+        XMLPortParam(Pawn, "shieldrechargewaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
 
         XMLPortParam(Pawn, "explosionSound",  setExplosionSound,  getExplosionSound,  xmlelement, mode);

code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h

@@ -46 +46 @@
         or below zero. If it is, the pawn gets killed.
 
-        Pawns can carry pickups and fire weapons. The can also have shields.
+        Pawns can carry pickups and fire weapons. They can also have shields.
 
         Notice that every Pawn is a ControllableEntity.