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

Timestamp:

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

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (1 diff)

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.