Merge pull request #21 from jprzimba/mana-drain-update

* Fix mana drain not displayed in Input Analyzer

src/game/game.cpp

@@ -7466,7 +7466,7 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
 		}
 
 		auto targetHealth = target->getHealth();
-		realDamage = damage.primary.value + damage.secondary.value;
+		realDamage = std::min<int32_t>(targetHealth, damage.primary.value + damage.secondary.value);
 		if (realDamage == 0) {
 			return true;
 		} else if (realDamage >= targetHealth) {
@@ -7502,13 +7502,6 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
 
 		addCreatureHealth(spectators.data(), target);
 
-		int32_t adjustedDamage = realDamage;
-		if (target) {
-			if (realDamage > targetHealth) {
-				adjustedDamage = targetHealth > 0 ? targetHealth : realDamage;
-			}
-		}
-
 		sendDamageMessageAndEffects(
 			attacker,
 			target,
@@ -7518,7 +7511,7 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
 			targetPlayer,
 			message,
 			spectators.data(),
-			adjustedDamage // realDamage
+			realDamage
 		);
 
 		if (attackerPlayer) {
@@ -7933,6 +7926,14 @@ bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std
 		}
 
 		target->drainMana(attacker, manaLoss);
+		std::string cause = "(other)";
+		if (attacker) {
+			cause = attacker->getName();
+		}
+
+		if (targetPlayer) {
+			targetPlayer->updateInputAnalyzer(damage.primary.type, manaLoss, cause);
+		}
 
 		std::stringstream ss;
 
@@ -7964,7 +7965,7 @@ bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std
 				} else if (targetPlayer == attackerPlayer) {
 					ss << " due to your own attack.";
 				} else {
-					ss << " mana due to an attack by " << attacker->getNameDescription() << '.';
+					ss << " due to an attack by " << attacker->getNameDescription() << '.';
 				}
 				message.type = MESSAGE_DAMAGE_RECEIVED;
 				message.text = ss.str();