Merge pull request #1175 from MageKing17/bugfix/energy-transfer-oddities

Fix two bugs with transferring energy to/from shields/weapons.

Author: asarium

code/object/objectshield.cpp

@@ -87,7 +87,7 @@ void shield_add_strength(object *objp, float delta) {
 	float shield_str = shield_get_strength(objp);
 	float shield_recharge_limit = shield_get_max_strength(objp);
 
-	if (shield_str >= shield_recharge_limit)
+	if ((delta > 0.0f) && (shield_str >= shield_recharge_limit))
 		return;
 
 	if (!(Ai_info[Ships[objp->instance].ai_index].ai_profile_flags[AI::Profile_Flags::Smart_shield_management])

code/ship/ship.cpp

@@ -8130,7 +8130,7 @@ void ship_chase_shield_energy_targets(ship *shipp, object *obj, float frametime)
 		shield_add_strength(obj, delta);
 		shipp->target_shields_delta -= delta;
 	} else if (shipp->target_shields_delta < 0.0f) {
-		if (delta < -shipp->target_shields_delta)
+		//if (delta > -shipp->target_shields_delta)
 			delta = -shipp->target_shields_delta;
 
 		shield_add_strength(obj, -delta);
@@ -8146,7 +8146,7 @@ void ship_chase_shield_energy_targets(ship *shipp, object *obj, float frametime)
 		shipp->weapon_energy += delta;
 		shipp->target_weapon_energy_delta -= delta;
 	} else if (shipp->target_weapon_energy_delta < 0.0f) {
-		if (delta < -shipp->target_weapon_energy_delta)
+		//if (delta > -shipp->target_weapon_energy_delta)
 			delta = -shipp->target_weapon_energy_delta;
 
 		shipp->weapon_energy -= delta;