weaponRecoveryTime (for shaders, mimics 1.76 laserHeatLevel behaviour for NPCs)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5003 127b21dd-08f5-0310-b4b7-95ae10353056

Resources/Config/whitelist.plist

@@ -384,6 +384,7 @@
 		"maxFlightSpeed",
 		"speedFactor",
 		"damage",
+		"weaponRecoveryTime",
 		"laserHeatLevel",
 		"hullHeatLevel",
 		"entityPersonality",

src/Core/Entities/ShipEntity.h

@@ -873,6 +873,7 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
 
 - (NSComparisonResult) compareBeaconCodeWith:(ShipEntity *)other;
 
+- (GLfloat)weaponRecoveryTime;
 - (GLfloat)laserHeatLevel;
 - (GLfloat)hullHeatLevel;
 - (GLfloat)entityPersonality;

src/Core/Entities/ShipEntity.m

@@ -7830,9 +7830,16 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
 }
 
 
+// for shaders, equivalent to 1.76's NPC laserHeatLevel
+- (GLfloat) weaponRecoveryTime
+{
+	float result = (weapon_recharge_rate - [self shotTime]) / weapon_recharge_rate;
+	return OOClamp_0_1_f(result);
+}
+
+
 - (GLfloat)laserHeatLevel
 {
-//	float result = (weapon_recharge_rate - [self shotTime]) / weapon_recharge_rate;
 	float result = weapon_temp / NPC_MAX_WEAPON_TEMP;
 	return OOClamp_0_1_f(result);
 }