From 3d500f049594a4559d28998421d7adc19d5ec014 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 26 Feb 2017 21:36:06 +0100
Subject: [PATCH] - added default obituaries for damage types.

Note that this is only implemented for the new official way of doing this in MAPINFO, but not in DECORATE!
---
 src/info.cpp          | 13 +++++++++++++
 src/info.h            |  3 +++
 src/p_interaction.cpp | 21 +++++++++++++--------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/info.cpp b/src/info.cpp
index 90d847fcc..81912150b 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -767,6 +767,13 @@ DEFINE_ACTION_FUNCTION(_DamageTypeDefinition, IgnoreArmor)
 	ACTION_RETURN_BOOL(DamageTypeDefinition::IgnoreArmor(type));
 }
 
+FString DamageTypeDefinition::GetObituary(FName type)
+{
+	DamageTypeDefinition *dtd = Get(type);
+	if (dtd) return dtd->Obituary;
+	return "";
+}
+
 
 //==========================================================================
 //
@@ -859,6 +866,12 @@ void FMapInfoParser::ParseDamageDefinition()
 			dtd.DefaultFactor = sc.Float;
 			if (dtd.DefaultFactor == 0) dtd.ReplaceFactor = true;
 		}
+		if (sc.Compare("OBITUARY"))
+		{
+			sc.MustGetStringName("=");
+			sc.MustGetString();
+			dtd.Obituary = sc.String;
+		}
 		else if (sc.Compare("REPLACEFACTOR"))
 		{
 			dtd.ReplaceFactor = true;
diff --git a/src/info.h b/src/info.h
index 05785f90b..50db1e4b6 100644
--- a/src/info.h
+++ b/src/info.h
@@ -214,6 +214,7 @@ struct DamageTypeDefinition
 public:
 	DamageTypeDefinition() { Clear(); }
 
+	FString Obituary;
 	double DefaultFactor;
 	bool ReplaceFactor;
 	bool NoArmor;
@@ -221,6 +222,7 @@ public:
 	void Apply(FName type);
 	void Clear()
 	{
+		Obituary = "";
 		DefaultFactor = 1.;
 		ReplaceFactor = false;
 		NoArmor = false;
@@ -228,6 +230,7 @@ public:
 
 	static bool IgnoreArmor(FName type);
 	static int ApplyMobjDamageFactor(int damage, FName type, DmgFactors const * const factors);
+	static FString GetObituary(FName type);
 
 private:
 	static double GetMobjDamageFactor(FName type, DmgFactors const * const factors);
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 7699fe376..38d9cd375 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -216,15 +216,20 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
 		}
 	}
 
-	switch (mod)
+	FString obit = DamageTypeDefinition::GetObituary(mod);
+	if (obit.IsNotEmpty()) messagename = obit;
+	else
 	{
-	case NAME_Suicide:		messagename = "OB_SUICIDE";		break;
-	case NAME_Falling:		messagename = "OB_FALLING";		break;
-	case NAME_Crush:		messagename = "OB_CRUSH";		break;
-	case NAME_Exit:			messagename = "OB_EXIT";		break;
-	case NAME_Drowning:		messagename = "OB_WATER";		break;
-	case NAME_Slime:		messagename = "OB_SLIME";		break;
-	case NAME_Fire:			if (attacker == NULL) messagename = "OB_LAVA";		break;
+		switch (mod)
+		{
+		case NAME_Suicide:		messagename = "OB_SUICIDE";		break;
+		case NAME_Falling:		messagename = "OB_FALLING";		break;
+		case NAME_Crush:		messagename = "OB_CRUSH";		break;
+		case NAME_Exit:			messagename = "OB_EXIT";		break;
+		case NAME_Drowning:		messagename = "OB_WATER";		break;
+		case NAME_Slime:		messagename = "OB_SLIME";		break;
+		case NAME_Fire:			if (attacker == NULL) messagename = "OB_LAVA";		break;
+		}
 	}
 
 	// Check for being killed by a voodoo doll.